From 25c473a8f2bdbd71b4abb2886638d5333e9b449d Mon Sep 17 00:00:00 2001
From: Pierre d'Herbemont <pdherbemont@videolan.org>
Date: Sun, 6 Jan 2008 06:25:53 +0000
Subject: [PATCH] contrib: Make sure we don't disable mmx if ld is working on
mac os x.
---
extras/contrib/bootstrap | 4 ++++
extras/contrib/src/Makefile | 8 +++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 730ef8d7b036..36c1ba80ea92 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -148,9 +148,13 @@ case $HOST in
;;
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
CFLAGS_TUNING=" -march=pentium-m -mtune=prescott"
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 527c88bb5d2e..13a5d97cba2a 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -147,7 +147,7 @@ ifdef HAVE_DARWIN_OS_ON_INTEL
FFMPEGCONF += --enable-memalign-hack --cpu=pentium-m
endif
-ifdef HAVE_DARWIN_9
+ifdef NO_TEXT_RELOCATION
FFMPEGCONF += --disable-mmx
endif
@@ -770,7 +770,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
ifdef HAVE_BEOS
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
else
- ifdef HAVE_DARWIN_9
+ ifdef 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
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples && make && make install)
@@ -1059,11 +1059,9 @@ endif
ifdef HAVE_DARWIN_OS
(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
endif
-ifdef HAVE_DARWIN_9
-ifdef HAVE_DARWIN_OS_ON_INTEL
+ifdef NO_TEXT_RELOCATION
(cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
endif
-endif
ifdef HAVE_UCLIBC
patch -p0 < Patches/ffmpeg-svn-uclibc.patch
patch -p0 < Patches/ffmpeg-svn-internal-define.patch
--
GitLab