[vlc-devel] commit: contribs: fixed linking libflac and libid3tag when cross-compiling on Darwin ( Felix Paul Kühne )

git version control git at videolan.org
Sun Aug 30 20:49:34 CEST 2009


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Aug 30 20:49:19 2009 +0200| [f6a2dead05967061faac2c9d5913005751cfdb4d] | committer: Felix Paul Kühne 

contribs: fixed linking libflac and libid3tag when cross-compiling on Darwin

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

 extras/contrib/src/Makefile |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9193f91..6c5f5ac 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -550,6 +550,9 @@ libid3tag-$(LIBID3TAG_VERSION).tar.gz:
 libid3tag: libid3tag-$(LIBID3TAG_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -d libid3tag -p0 < Patches/libid3tag-0.15.1b-fix-CVE-2008-2109.patch
+ifdef HAVE_DARWIN_OS
+	( cd $@; sed -e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' -i.orig  configure )
+endif
 
 .id3tag: libid3tag
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
@@ -808,6 +811,9 @@ flac: flac-$(FLAC_VERSION).tar.gz
 ifdef HAVE_WIN32
 	patch -p0 < Patches/flac-win32.patch
 endif
+ifdef HAVE_DARWIN_OS
+	( cd $@; sed -e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' -i.orig  configure )
+endif
 
 FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs
 




More information about the vlc-devel mailing list