Changeset 25c473a8f2bdbd71b4abb2886638d5333e9b449d

Timestamp:

06/01/08 07:25:53 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1199600753 +0000

git-parent:

[23b538b7c87e3fbc82051bb0f17498057243ea94]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1199600753 +0000

Message:

contrib: Make sure we don't disable mmx if ld is working on mac os x.

Files:

• extras/contrib/bootstrap (modified) (1 diff)
• extras/contrib/src/Makefile (modified) (3 diffs)

extras/contrib/bootstrap

@@ -149 +149 @@
-    i686-apple-darwin9)
-        SDK_TARGET=10.4
+        MIN_LD_VERSION_WITH_TEXT_RELOCATION=81
-        echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
-        echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak
-        echo "HAVE_DARWIN_9 = 1" >> config.mak
+        if test `ld -v 2> /dev/stdout | sed -E 's/.*ld64-([0-9]+).*/\1/'` -lt ${MIN_LD_VERSION_WITH_TEXT_RELOCATION}; then
+            echo "NO_TEXT_RELOCATION = 1" >> config.mak
+        fi
-        echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
-        echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak

extras/contrib/src/Makefile

@@ -148 +148 @@
-endif
-
-HAVE_DARWIN_9
+NO_TEXT_RELOCATION
-FFMPEGCONF += --disable-mmx
-endif
@@ -771 +771 @@
-    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
-else
-HAVE_DARWIN_9
+NO_TEXT_RELOCATION
-    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
-  else
@@ -1060 +1060 @@
-    (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
-endif
-
-
+
-    (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
-endif
-endif
-ifdef HAVE_UCLIBC