Updated build to work with Xcode 6.

Author: freakboy3742

Makefile

@@ -12,22 +12,22 @@ RUBICON_VERSION=0.1.2
 IPHONE_ARMV7_SDK_ROOT=$(shell xcrun --sdk iphoneos --show-sdk-path)
 IPHONE_ARMV7_CC=$(shell xcrun -find -sdk iphoneos clang)
 IPHONE_ARMV7_LD=$(shell xcrun -find -sdk iphoneos ld)
-IPHONE_ARMV7_CFLAGS=-arch armv7 -pipe -no-cpp-precomp -isysroot $(IPHONE_ARMV7_SDK_ROOT) -miphoneos-version-min=5.1.1
-IPHONE_ARMV7_LDFLAGS=-arch armv7 -isysroot $(IPHONE_ARMV7_SDK_ROOT) -miphoneos-version-min=5.1.1
+IPHONE_ARMV7_CFLAGS=-arch armv7 -pipe -no-cpp-precomp -isysroot $(IPHONE_ARMV7_SDK_ROOT) -miphoneos-version-min=6.0
+IPHONE_ARMV7_LDFLAGS=-arch armv7 -isysroot $(IPHONE_ARMV7_SDK_ROOT) -miphoneos-version-min=6.0
 
 # IPHONE build commands and flags
 IPHONE_ARMV7S_SDK_ROOT=$(shell xcrun --sdk iphoneos --show-sdk-path)
 IPHONE_ARMV7S_CC=$(shell xcrun -find -sdk iphoneos clang)
 IPHONE_ARMV7S_LD=$(shell xcrun -find -sdk iphoneos ld)
-IPHONE_ARMV7S_CFLAGS=-arch armv7s -pipe -no-cpp-precomp -isysroot $(IPHONE_ARMV7S_SDK_ROOT) -miphoneos-version-min=5.1.1
-IPHONE_ARMV7S_LDFLAGS=-arch armv7s -isysroot $(IPHONE_ARMV7S_SDK_ROOT) -miphoneos-version-min=5.1.1
+IPHONE_ARMV7S_CFLAGS=-arch armv7s -pipe -no-cpp-precomp -isysroot $(IPHONE_ARMV7S_SDK_ROOT) -miphoneos-version-min=6.0
+IPHONE_ARMV7S_LDFLAGS=-arch armv7s -isysroot $(IPHONE_ARMV7S_SDK_ROOT) -miphoneos-version-min=6.0
 
 # IPHONE_SIMULATOR build commands and flags
 IPHONE_SIMULATOR_SDK_ROOT=$(shell xcrun --sdk iphonesimulator --show-sdk-path)
 IPHONE_SIMULATOR_CC=$(shell xcrun -find -sdk iphonesimulator clang)
 IPHONE_SIMULATOR_LD=$(shell xcrun -find -sdk iphonesimulator ld)
-IPHONE_SIMULATOR_CFLAGS=-arch i386 -pipe -no-cpp-precomp -isysroot $(IPHONE_SIMULATOR_SDK_ROOT) -miphoneos-version-min=5.1.1
-IPHONE_SIMULATOR_LDFLAGS=-arch i386 -isysroot $(IPHONE_SIMULATOR_SDK_ROOT) -miphoneos-version-min=5.1.1
+IPHONE_SIMULATOR_CFLAGS=-arch i386 -pipe -no-cpp-precomp -isysroot $(IPHONE_SIMULATOR_SDK_ROOT) -miphoneos-version-min=6.0
+IPHONE_SIMULATOR_LDFLAGS=-arch i386 -isysroot $(IPHONE_SIMULATOR_SDK_ROOT) -miphoneos-version-min=6.0
 
 
 all: working-dirs build/ffi.framework build/Python.framework
@@ -77,6 +77,8 @@ src/libffi-$(FFI_VERSION): downloads/libffi-$(FFI_VERSION).tar.gz
 build/ffi.framework: src/libffi-$(FFI_VERSION)
 	cd src/libffi-$(FFI_VERSION) && patch -p1 -N < ../../patch/libffi/ffi-sysv.S.patch
 	cd src/libffi-$(FFI_VERSION) && patch -p1 -N < ../../patch/libffi/project.pbxproj.patch
+	cd src/libffi-$(FFI_VERSION) && patch -p1 -N < ../../patch/libffi/build-ios.sh.patch
+	cd src/libffi-$(FFI_VERSION) && patch -p1 -N < ../../patch/libffi/generate-ios-source-and-headers.py.patch
 	cd src/libffi-$(FFI_VERSION) && python generate-ios-source-and-headers.py
 	cd src/libffi-$(FFI_VERSION) && xcodebuild -project libffi.xcodeproj -target "Framework" -configuration Release -sdk iphoneos$(SDKVER) OTHER_CFLAGS="-no-integrated-as"
 	cp -a src/libffi-$(FFI_VERSION)/build/Release-universal/ffi.framework build

README.rst

@@ -56,13 +56,7 @@ This should:
 The build products will be in the `build` directory. You'll need to add
 **all** these frameworks (not just Python.framework) to your project.
 
-.. note:: Xcode version compatibility
-
-   At this time, the libraries only compile work with Xcode 5.1.1 and
-   earlier. See `this ticket`_ for details of a workaround if you need
-   to have Xcode 6 installed on your machine.
-
-.. _downloaded: https://github.com/pybee/Python-iOS-support/releases/download/2.7.1-b2/Python-2.7.1-iOS-support.b2.tar.gz
+.. _downloaded: https://github.com/pybee/Python-iOS-support/releases/download/2.7.1-b3/Python-2.7.1-iOS-support.b3.tar.gz
 
 Acknowledgements
 ----------------
@@ -76,4 +70,3 @@ The approach to framework packaging is drawn from `Jeff Verkoeyen`_, and
 .. _Jeff Verkoeyen: https://github.com/jverkoey/iOS-Framework
 .. _Ernesto García's: http://www.raywenderlich.com/41377/creating-a-static-library-in-ios-tutorial
 .. _Rubicon Objective-C: http://github.com/pybee/rubicon-objc
-.. _this ticket: https://github.com/pybee/Python-iOS-template/issues/3

patch/libffi/build-ios.sh.patch

@@ -0,0 +1,13 @@
+--- libffi-3.0.13-old/build-ios.sh	2014-10-20 18:42:48.000000000 +0800
++++ libffi-3.0.13-new/build-ios.sh	2014-10-20 18:43:50.000000000 +0800
+@@ -2,8 +2,8 @@
+
+ PLATFORM_IOS=/Developer/Platforms/iPhoneOS.platform/
+ PLATFORM_IOS_SIM=/Developer/Platforms/iPhoneSimulator.platform/
+-SDK_IOS_VERSION="4.2"
+-MIN_IOS_VERSION="3.0"
++SDK_IOS_VERSION="6.0"
++MIN_IOS_VERSION="6.0"
+ OUTPUT_DIR="universal-ios"
+
+ build_target () {

patch/libffi/generate-ios-source-and-headers.py.patch

@@ -0,0 +1,11 @@
+--- libffi-3.0.13-old/generate-ios-source-and-headers.py  2014-10-20 21:16:29.000000000 +0800
++++ libffi-3.0.13-new/generate-ios-source-and-headers.py  2014-10-20 21:16:31.000000000 +0800
+@@ -125,7 +125,7 @@
+         os.makedirs(build_dir)
+         env = dict(CC=xcrun_cmd('clang'),
+                    LD=xcrun_cmd('ld'),
+-                   CFLAGS='-arch %s -isysroot %s -miphoneos-version-min=4.0' % (platform.arch, platform.sdkroot))
++                   CFLAGS='-arch %s -isysroot %s -miphoneos-version-min=6.0' % (platform.arch, platform.sdkroot))
+         working_dir=os.getcwd()
+         try:
+             os.chdir(build_dir)