vlc | branch: master | Steve Lhomme <[email protected]> | Tue Feb 19 10:05:30 2019 +0100| [6fc91af3f0e355c155ab974db01e4026e6955354] | committer: Steve Lhomme
contrib: protobuf: fix protobuf compilation from 2a031d1ef349b1d6fc1201ef8c54ce9216568c38 - the wrong folder was used to build - The deleted patch was still used > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6fc91af3f0e355c155ab974db01e4026e6955354 --- contrib/src/protobuf/rules.mak | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak index b5d3949a83..f5d459c576 100644 --- a/contrib/src/protobuf/rules.mak +++ b/contrib/src/protobuf/rules.mak @@ -37,13 +37,12 @@ PROTOBUF_CONF = -DBUILD_SHARED_LIBS=OFF -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BU protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf $(UNPACK) mv protobuf-$(PROTOBUF_VERSION) protobuf-$(PROTOBUF_VERSION)-cpp - $(APPLY) $(SRC)/protobuf/dont-build-protoc.patch $(APPLY) $(SRC)/protobuf/protobuf-win32.patch $(APPLY) $(SRC)/protobuf/protobuf-cmake-pkgconfig.patch $(MOVE) .protobuf: protobuf toolchain.cmake cd $</ && mkdir -p $(HOST) - cd $</$(HOST) && $(HOSTVARS_PIC) $(CMAKE) -S .. -B ../cmake $(PROTOBUF_CONF) + cd $</ && $(HOSTVARS_PIC) $(CMAKE) -S cmake -B $(HOST) $(PROTOBUF_CONF) cd $</ && $(MAKE) -C $(HOST) && $(MAKE) -C $(HOST) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
