From be2b671628f5056dd0bd6804f9fc41d5f4969658 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Thu, 3 Oct 2013 14:49:34 +0200
Subject: [PATCH] Fix i386 compilation, which was triggering link errors for
 the iPhoneSimulator target.

---
 submodules/build/builders.d/ffmpeg.mk | 10 +++++-----
 submodules/build/iphone-config.site   |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk
index efc195970..55c65aff1 100644
--- a/submodules/build/builders.d/ffmpeg.mk
+++ b/submodules/build/builders.d/ffmpeg.mk
@@ -4,13 +4,12 @@ ffmpeg_configure_options=\
 	--disable-ffprobe --disable-ffserver  --disable-avdevice \
 	--disable-avfilter  --disable-network \
 	--disable-everything  --enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 \
-	--enable-decoder=h264 --disable-avformat --enable-armv6 --enable-armv6t2 \
+	--enable-decoder=h264 --disable-avformat \
 	--cross-prefix=$$SDK_BIN_PATH/ \
 	--sysroot=$$SYSROOT_PATH --arch=$$ARCH \
-	--enable-static   --disable-shared --target-os=darwin \
+	--enable-static --disable-shared --target-os=darwin \
 	--extra-cflags="$$COMMON_FLAGS" --extra-ldflags="$$COMMON_FLAGS" \
 	--disable-iconv \
-	--disable-armv5te \
 	--ar="$$AR" \
 	--nm="$$NM" \
 	--cc="$$CC"
@@ -19,12 +18,13 @@ ffmpeg_configure_options=\
 
 #--sysinclude=PATH        location of cross-build system headers
 ifneq (,$(findstring armv6,$(host)))
-	ffmpeg_configure_options+= --cpu=arm1176jzf-s
+	ffmpeg_configure_options+= --cpu=arm1176jzf-s --disable-armv5te  --enable-armv6 --enable-armv6t2 
 endif
 
 ifneq (,$(findstring armv7,$(host)))
-	ffmpeg_configure_options+= --enable-neon --cpu=cortex-a8 
+	ffmpeg_configure_options+= --enable-neon --cpu=cortex-a8 --disable-armv5te  --enable-armv6 --enable-armv6t2 
 endif
+
 ffmpeg_dir?=externals/ffmpeg
 $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/patched :
 	cd $(BUILDER_SRC_DIR)/$(ffmpeg_dir) \
diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site
index 1e8a74b95..1597865b5 100644
--- a/submodules/build/iphone-config.site
+++ b/submodules/build/iphone-config.site
@@ -48,6 +48,7 @@ LD="xcrun ld -arch ${ARCH}"
 AR="xcrun ar"
 RANLIB="xcrun ranlib"
 STRIP="xcrun strip"
+NM="xcrun nm"
 
 CPPFLAGS="-Dasm=__asm"
 OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch"