[vlc-commits] contrib: matroska: fix passing flags to to compiler

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Thu May 17 
12:35:08 2018 +0200| [9273d0fd0b21814f1511dc19401b6932f54a62f2] | committer: 
Jean-Baptiste Kempf

contrib: matroska: fix passing flags to to compiler

Given it wasn't use maybe it's not needed anymore with the switch to cmake.

(cherry picked from commit fb607e31d866362bfd9081ed85e35f26802dce00)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=9273d0fd0b21814f1511dc19401b6932f54a62f2
---

 contrib/src/matroska/rules.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 6c2b2096f2..87ea3f45aa 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -21,9 +21,9 @@ libmatroska: libmatroska-$(MATROSKA_VERSION).tar.xz 
.sum-matroska
$(call pkg_static,"libmatroska.pc.in")
$(MOVE)
 
-MATROSKA_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
+MATROSKA_CXXFLAGS := $(CXXFLAGS) -fvisibility=hidden
 
 .matroska: libmatroska toolchain.cmake
-   cd $< && $(HOSTVARS_PIC) $(CMAKE) -DBUILD_SHARED_LIBS=OFF
+   cd $< && $(HOSTVARS_PIC) CXXFLAGS="$(MATROSKA_CXXFLAGS)" $(CMAKE) 
-DBUILD_SHARED_LIBS=OFF
cd $< && $(MAKE) install
touch $@

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: matroska: fix passing flags to to compiler

[Steve Lhomme]

vlc | branch: master | Steve Lhomme  | Thu May 17 12:35:08 
2018 +0200| [fb607e31d866362bfd9081ed85e35f26802dce00] | committer: Steve Lhomme

contrib: matroska: fix passing flags to to compiler

Given it wasn't use maybe it's not needed anymore with the switch to cmake.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fb607e31d866362bfd9081ed85e35f26802dce00
---

 contrib/src/matroska/rules.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 6c2b2096f2..87ea3f45aa 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -21,9 +21,9 @@ libmatroska: libmatroska-$(MATROSKA_VERSION).tar.xz 
.sum-matroska
$(call pkg_static,"libmatroska.pc.in")
$(MOVE)
 
-MATROSKA_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
+MATROSKA_CXXFLAGS := $(CXXFLAGS) -fvisibility=hidden
 
 .matroska: libmatroska toolchain.cmake
-   cd $< && $(HOSTVARS_PIC) $(CMAKE) -DBUILD_SHARED_LIBS=OFF
+   cd $< && $(HOSTVARS_PIC) CXXFLAGS="$(MATROSKA_CXXFLAGS)" $(CMAKE) 
-DBUILD_SHARED_LIBS=OFF
cd $< && $(MAKE) install
touch $@

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits