vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Thu Apr 20 18:07:52 2017 +0200| [461ec4bb9a87bde7cd78a07ced7c24f89218395c] | committer: Hugo Beauzée-Luyssen
contribs: protobuf: Don't build protoc when specifying --with-protoc > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=461ec4bb9a87bde7cd78a07ced7c24f89218395c --- contrib/src/protobuf/dont-build-protoc.patch | 13 +++++++++++++ contrib/src/protobuf/rules.mak | 1 + 2 files changed, 14 insertions(+) diff --git a/contrib/src/protobuf/dont-build-protoc.patch b/contrib/src/protobuf/dont-build-protoc.patch new file mode 100644 index 0000000000..061cf4c4e1 --- /dev/null +++ b/contrib/src/protobuf/dont-build-protoc.patch @@ -0,0 +1,13 @@ +--- protobuf/src/Makefile.am.old 2017-04-20 17:58:28.941775687 +0200 ++++ protobuf/src/Makefile.am 2017-04-20 17:57:40.629763450 +0200 +@@ -481,7 +481,10 @@ + google/protobuf/compiler/csharp/csharp_wrapper_field.cc \ + google/protobuf/compiler/csharp/csharp_wrapper_field.h + ++EXTRA_PROGRAMS = protoc ++if !USE_EXTERNAL_PROTOC + bin_PROGRAMS = protoc ++endif + protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la + protoc_SOURCES = google/protobuf/compiler/main.cc + diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak index da4057aaeb..d8d958081b 100644 --- a/contrib/src/protobuf/rules.mak +++ b/contrib/src/protobuf/rules.mak @@ -17,6 +17,7 @@ DEPS_protobuf = zlib $(DEPS_zlib) protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf $(UNPACK) mv protobuf-3.1.0 protobuf-3.1.0-cpp + $(APPLY) $(SRC)/protobuf/dont-build-protoc.patch $(MOVE) .protobuf: protobuf _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
