From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Mon, 13 Apr 2009 21:10:31 +0000 (+0200)
Subject: contribs: don't compile ffmpeg with mdynamic-no-pic on PPC-Macs, as this is a really... 
X-Git-Tag: 1.0.0-pre2~69
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=766e15644a970d699530e68399edd5912e7faea5;p=vlc

contribs: don't compile ffmpeg with mdynamic-no-pic on PPC-Macs, as this is a really bad idea. You need PIC in shared libs on this platform.

This slows down the compilation speed by 5%, but that should be fine. Pointed by nobody.loopback on the forum.
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5caf082590..4c40838f24 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1089,6 +1089,8 @@ ifdef HAVE_BEOS
 endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
+else
+    (cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch) 
 endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-uclibc.patch
diff --git a/extras/contrib/src/Patches/ffmpeg-darwin-ppc-mdynamic.patch b/extras/contrib/src/Patches/ffmpeg-darwin-ppc-mdynamic.patch
new file mode 100644
index 0000000000..25ae82a9a0
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-darwin-ppc-mdynamic.patch
@@ -0,0 +1,12 @@
+Index: configure
+===================================================================
+--- configure	(revision 18349)
++++ configure	(working copy)
+@@ -1758,7 +1758,6 @@
+         add_cflags -pipe
+         check_cflags -force_cpusubtype_ALL
+         check_cflags -Wno-sign-compare
+-        enabled shared || check_cflags -mdynamic-no-pic
+     fi
+ fi
+