[vlc-commits] [Git][videolan/vlc][master] 4 commits: contrib: protoc: remove if overreach

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
61b48183 by Rémi Denis-Courmont at 2022-01-25T15:17:32+00:00
contrib: protoc: remove if overreach

- - - - -
72023b30 by Rémi Denis-Courmont at 2022-01-25T15:17:32+00:00
contrib: protobuf: really do not build protoc

Disabling the binary is not enough. Its reverse dependencies also must
be disabled.

- - - - -
e85c1dd7 by Rémi Denis-Courmont at 2022-01-25T15:17:32+00:00
contrib: protobuf: do not pass system protoc

This is not necessary here, and it causes the whole contrib to fail on
Linux distribution that provide a newer protoc than in VLC extra tools.

- - - - -
a61b5c7d by Rémi Denis-Courmont at 2022-01-25T15:17:32+00:00
contrib: protobuf: do not clobber global variable

$(PROTOC) is set by the main Makefile already, thank you very much.

- - - - -


2 changed files:

- contrib/src/protobuf/dont-build-protoc.patch
- contrib/src/protobuf/rules.mak


Changes:

=====================================
contrib/src/protobuf/dont-build-protoc.patch
=====================================
@@ -1,24 +1,19 @@
---- 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
- 
---- protobuf/src/Makefile.am.old	2018-03-14 15:00:19.974044729 +0100
-+++ protobuf/src/Makefile.am	2018-03-14 15:01:03.158043968 +0100
-@@ -174,7 +174,7 @@
-   google/protobuf/util/type_resolver_util.h                     \
-   google/protobuf/util/message_differencer.h
+diff -p1 -ru protobuf.orig/src/Makefile.am protobuf/src/Makefile.am
+--- protobuf.orig/src/Makefile.am	2022-01-19 19:57:56.774686401 +0200
++++ protobuf/src/Makefile.am	2022-01-19 20:02:13.977240991 +0200
+@@ -176,3 +176,4 @@ nobase_include_HEADERS =
  
 -lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
 +lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la
++check_LTLIBRARIES = libprotoc.la
+ 
+@@ -483,3 +484,3 @@ libprotoc_la_SOURCES =
+ 
+-bin_PROGRAMS = protoc
++#bin_PROGRAMS = protoc
+ protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la
+@@ -661,3 +662,3 @@ protoc_outputs =
+ 
+-BUILT_SOURCES = $(protoc_outputs)
++#BUILT_SOURCES = $(protoc_outputs)
  
- libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
- libprotobuf_lite_la_LDFLAGS = -version-info 11:0:0 -export-dynamic -no-undefined


=====================================
contrib/src/protobuf/rules.mak
=====================================
@@ -4,25 +4,10 @@ PROTOBUF_URL := https://github.com/google/protobuf/releases/download/v$(PROTOBUF
 
 ifndef HAVE_TVOS
 PKGS += protobuf
+endif # !HAVE_TVOS
 ifeq ($(call need_pkg, "protobuf-lite >= 3.1.0 protobuf-lite < 3.2.0"),)
 PKGS_FOUND += protobuf
-else
-# check we have a matching protoc to use
-PROTOC_ABSPATH = $(shell PATH="$(PATH)" command -v protoc)
-ifeq ($(PROTOC_ABSPATH),)
-PROTOC = $(error protoc not found (search path: $(PATH)))
-else
-# make sure the installed protoc is compatible with the version we want to build
-SYS_PROTOC_VER = $(shell $(PROTOC_ABSPATH) --version)
-SYS_PROTOC_VERSION = $(word $(words $(SYS_PROTOC_VER)) , $(SYS_PROTOC_VER))
-ifneq ($(PROTOBUF_VERSION),$(SYS_PROTOC_VERSION))
-PROTOC = $(error protoc system version $(SYS_PROTOC_VERSION) and required version $(PROTOBUF_VERSION) do not match)
-else
-PROTOC = $(PROTOC_ABSPATH)
-endif
 endif
-endif
-endif # !HAVE_TVOS
 
 $(TARBALLS)/protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz:
 	$(call download_pkg,$(PROTOBUF_URL),protobuf)
@@ -43,6 +28,6 @@ protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf
 
 .protobuf: protobuf
 	$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc="$(PROTOC)"
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) && $(MAKE) install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a4d0e534a12d2c1d68e2f11a71132aa9973251a7...a61b5c7d47a2ae5aba703b2a4dfbd31b3a9322a9

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a4d0e534a12d2c1d68e2f11a71132aa9973251a7...a61b5c7d47a2ae5aba703b2a4dfbd31b3a9322a9
You're receiving this email because of your account on code.videolan.org.