[vlc-commits] contrib: force PIC for CMake stuff
Rémi Denis-Courmont
git at videolan.org
Mon Aug 8 17:33:24 CEST 2011
vlc | branch: master | Rémi Denis-Courmont <remi.denis-courmont at nokia.com> | Mon Aug 8 18:31:30 2011 +0300| [b65c584aaa41e11bcbd44589b68ca5df16098afe] | committer: Rémi Denis-Courmont
contrib: force PIC for CMake stuff
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b65c584aaa41e11bcbd44589b68ca5df16098afe
---
contrib/src/gme/rules.mak | 2 +-
contrib/src/mpcdec/rules.mak | 2 +-
contrib/src/taglib/rules.mak | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/src/gme/rules.mak b/contrib/src/gme/rules.mak
index 182494f..ac5dcc5 100644
--- a/contrib/src/gme/rules.mak
+++ b/contrib/src/gme/rules.mak
@@ -16,6 +16,6 @@ game-music-emu: game-music-emu-$(GME_VERSION).tar.bz2 .sum-gme
$(MOVE)
.gme: game-music-emu toolchain.cmake
- cd $< && $(CMAKE) .
+ cd $< && $(HOSTVARS_PIC) $(CMAKE) .
cd $< && $(MAKE) install
touch $@
diff --git a/contrib/src/mpcdec/rules.mak b/contrib/src/mpcdec/rules.mak
index 8825abd..5780abc 100644
--- a/contrib/src/mpcdec/rules.mak
+++ b/contrib/src/mpcdec/rules.mak
@@ -39,7 +39,7 @@ endif
touch $@
.mpcdec: musepack toolchain.cmake
- cd $< && $(CMAKE) -DSHARED=OFF .
+ cd $< && $(HOSTVARS_PIC) $(CMAKE) -DSHARED=OFF .
cd $< && $(MAKE) install
mkdir -p -- "$(PREFIX)/lib"
cd $< && cp libmpcdec/libmpcdec_static.a "$(PREFIX)/lib/libmpcdec.a"
diff --git a/contrib/src/taglib/rules.mak b/contrib/src/taglib/rules.mak
index 15240ba..187dcd1 100644
--- a/contrib/src/taglib/rules.mak
+++ b/contrib/src/taglib/rules.mak
@@ -20,7 +20,7 @@ endif
$(MOVE)
.taglib: taglib toolchain.cmake
- cd $< && $(HOSTVARS) $(CMAKE) \
+ cd $< && $(HOSTVARS_PIC) $(CMAKE) \
-DENABLE_STATIC:BOOL=ON \
-DWITH_ASF:BOOL=ON \
-DWITH_MP4:BOOL=ON .
More information about the vlc-commits
mailing list