vlc | branch: master | Steve Lhomme <[email protected]> | Tue May 29 17:56:12 2018 +0200| [106a02ddd45cc7e24a23fe186f871ecbfbaba31c] | committer: Steve Lhomme
contrib: fix C/XXFLAGS overriding missing the $(PIC) flags > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=106a02ddd45cc7e24a23fe186f871ecbfbaba31c --- contrib/src/ebml/rules.mak | 2 +- contrib/src/libplacebo/rules.mak | 4 ++-- contrib/src/matroska/rules.mak | 2 +- contrib/src/srt/rules.mak | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak index 47665ae1e1..32c1a5430f 100644 --- a/contrib/src/ebml/rules.mak +++ b/contrib/src/ebml/rules.mak @@ -20,7 +20,7 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml $(MOVE) # libebml requires exceptions -EBML_CXXFLAGS := $(CXXFLAGS) -fexceptions -fvisibility=hidden +EBML_CXXFLAGS := $(CXXFLAGS) $(PIC) -fexceptions -fvisibility=hidden .ebml: ebml toolchain.cmake cd $< && $(HOSTVARS_PIC) CXXFLAGS="$(EBML_CXXFLAGS)" $(CMAKE) -DBUILD_SHARED_LIBS=OFF diff --git a/contrib/src/libplacebo/rules.mak b/contrib/src/libplacebo/rules.mak index 871418b00d..216b79591c 100644 --- a/contrib/src/libplacebo/rules.mak +++ b/contrib/src/libplacebo/rules.mak @@ -4,8 +4,8 @@ PLACEBO_VERSION := 0.2.1 PLACEBO_URL := https://github.com/haasn/libplacebo/archive/v$(PLACEBO_VERSION).tar.gz PLACEBO_ARCHIVE = libplacebo-$(PLACEBO_VERSION).tar.gz -LIBPLACEBO_CFLAGS := $(CFLAGS) -LIBPLACEBO_CXXFLAGS := $(CXXFLAGS) +LIBPLACEBO_CFLAGS := $(CFLAGS) $(PIC) +LIBPLACEBO_CXXFLAGS := $(CXXFLAGS) $(PIC) ifdef HAVE_WIN32 LIBPLACEBO_WIN32 = HAVE_WIN32=1 endif diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak index 87ea3f45aa..13235e17fa 100644 --- a/contrib/src/matroska/rules.mak +++ b/contrib/src/matroska/rules.mak @@ -21,7 +21,7 @@ libmatroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska $(call pkg_static,"libmatroska.pc.in") $(MOVE) -MATROSKA_CXXFLAGS := $(CXXFLAGS) -fvisibility=hidden +MATROSKA_CXXFLAGS := $(CXXFLAGS) $(PIC) -fvisibility=hidden .matroska: libmatroska toolchain.cmake cd $< && $(HOSTVARS_PIC) CXXFLAGS="$(MATROSKA_CXXFLAGS)" $(CMAKE) -DBUILD_SHARED_LIBS=OFF diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak index 6807b4a7b1..93d6e8c255 100644 --- a/contrib/src/srt/rules.mak +++ b/contrib/src/srt/rules.mak @@ -11,8 +11,8 @@ ifeq ($(call need_pkg,"srt >= 1.2.2"),) PKGS_FOUND += srt endif -SRT_CFLAGS := $(CFLAGS) -SRT_CXXFLAGS := $(CXXFLAGS) +SRT_CFLAGS := $(CFLAGS) $(PIC) +SRT_CXXFLAGS := $(CXXFLAGS) $(PIC) DEPS_srt = gnutls $(DEPS_gnutls) ifdef HAVE_WIN32 DEPS_srt += pthreads $(DEPS_pthreads) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
