contribs/osx: compilation fixes for libtool on PPC and FFmpeg in general

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 0d82cd96ac6e5710ebb9eebaf523fc2a587c131f..9dc7646c57ae85381e79398f6fb5aa5f5be8e972 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -156,13 +156,14 @@ case $HOST in
         echo "HAVE_DARWIN_9 = 1" >> config.mak
         HAVE_DARWIN_9=1
         CFLAGS_TUNING=" -arch ppc -mtune=G4"
-        EXTRA_CFLAGS=" -D\${ENVP} -mmacosx-version-min=\${SDK_TARGET}"
+        EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
+        EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
         if test -z "$CONTRIBS_CC_LLVM"; then
-            CC="gcc -isysroot \${MACOSX_SDK}"
-            CXX="g++ -isysroot \${MACOSX_SDK}"
+            CC="gcc"
+            CXX="g++"
         else
-            CC="/Developer/usr/llvm-gcc-4.2/bin/powerpc-apple-darwin9-llvm-gcc-4.2 -isysroot \${MACOSX_SDK}"
-            CXX="/Developer/usr/llvm-gcc-4.2/bin/powerpc-apple-darwin9-llvm-g++-4.2 -isysroot \${MACOSX_SDK}"
+            CC="/Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2"
+            CXX="/Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2"
         fi
         LD="ld -arch ppc -syslibroot \${MACOSX_SDK}"
         echo "PATH = /bin:/usr/bin:/usr/local/bin:" >> config.mak
@@ -199,11 +200,11 @@ case $HOST in
         EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
         EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
         if test -z "$CONTRIBS_CC_LLVM"; then
-            CC="gcc -isysroot \${MACOSX_SDK}"
-            CXX="g++ -isysroot \${MACOSX_SDK}"
+            CC="gcc"
+            CXX="g++"
         else
-            CC="/Developer/usr/llvm-gcc-4.2/bin/i686-apple-darwin9-llvm-gcc-4.2 -isysroot \${MACOSX_SDK}"
-            CXX="/Developer/usr/llvm-gcc-4.2/bin/i686-apple-darwin9-llvm-g++-4.2 -isysroot \${MACOSX_SDK}"
+            CC="/Developer/usr/llvm-gcc-4.2/bin/i686-apple-darwin9-llvm-gcc-4.2"
+            CXX="/Developer/usr/llvm-gcc-4.2/bin/i686-apple-darwin9-llvm-g++-4.2"
         fi
         echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         cat src/Distributions/darwin.mak >> distro.mak

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4848929912bc80874bc085eb0df0131788cc19be..647ef28082ab067c867b5200973d42a0eb4f6691 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -149,6 +149,7 @@ endif
 
 ifdef HAVE_DARWIN_OS
 X264CONF += --enable-pic
+FFMPEGCONF += --cc=$(CC)
 FFMPEGCONF += --arch=$(ARCH)
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEG_CFLAGS += -DHAVE_LRINTF