Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit 8eefb5e

Browse files
freakboy3742freakboy3742
committed
Modified output target name for libffi binary.
1 parent 87127df commit 8eefb5e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ working-dirs: download src build
5252
###########################################################################
5353

5454
# Clean the libffi project
55-
clean-libffi:
55+
clean-ffi:
5656
rm -rf src/libffi-$(FFI_VERSION)
5757
rm -rf build/ffi.framework
5858

‎patch/libffi/3.0.13/project.pbxproj.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- old/libffi.xcodeproj/project.pbxproj 2014-04-26 11:35:08.000000000 +0800
2-
+++ new/libffi.xcodeproj/project.pbxproj 2014-04-26 16:06:48.000000000 +0800
1+
--- old/libffi.xcodeproj/project.pbxproj 2013-03-16 19:19:39.000000000 +0800
2+
+++ new/libffi.xcodeproj/project.pbxproj 2014-05-07 08:45:46.000000000 +0800
33
@@ -6,36 +6,32 @@
44
objectVersion = 46;
55
objects = {
@@ -261,7 +261,7 @@
261261
- shellPath = /usr/bin/python;
262262
- shellScript = "import subprocess\nimport re\nimport os\nimport errno\nimport sys\n\ndef main():\n with open('src/arm/trampoline.S', 'w') as tramp_out:\n p = subprocess.Popen(['bash', 'src/arm/gentramp.sh'], stdout=tramp_out)\n p.wait()\n\nif __name__ == '__main__':\n main()";
263263
+ shellPath = /bin/sh;
264-
+ shellScript = "set -e\nset +u\n# Avoid recursively calling this script.\nif [[ $SF_MASTER_SCRIPT_RUNNING ]]\nthen\nexit 0\nfi\nset -u\nexport SF_MASTER_SCRIPT_RUNNING=1\n\nSF_EXECUTABLE_NAME=\"${EXECUTABLE_PREFIX}${PRODUCT_NAME}.${EXECUTABLE_EXTENSION}\"\nSF_WRAPPER_NAME=\"${PRODUCT_NAME}.framework\"\n\n# The following conditionals come from\n# https://github.com/kstenerud/iOS-Universal-Framework\n\nif [[ \"$SDK_NAME\" =~ ([A-Za-z]+) ]]\nthen\nSF_SDK_PLATFORM=${BASH_REMATCH[1]}\nelse\necho \"Could not find platform name from SDK_NAME: $SDK_NAME\"\nexit 1\nfi\n\nif [[ \"$SDK_NAME\" =~ ([0-9]+.*$) ]]\nthen\nSF_SDK_VERSION=${BASH_REMATCH[1]}\nelse\necho \"Could not find sdk version from SDK_NAME: $SDK_NAME\"\nexit 1\nfi\n\nif [[ \"$SF_SDK_PLATFORM\" = \"iphoneos\" ]]\nthen\nSF_OTHER_PLATFORM=iphonesimulator\nARCH_FLAGS=\"-arch i386\"\nelse\nSF_OTHER_PLATFORM=iphoneos\nARCH_FLAGS=\"\"\nfi\n\nif [[ \"$BUILT_PRODUCTS_DIR\" =~ (.*)$SF_SDK_PLATFORM$ ]]\nthen\nSF_OTHER_BUILT_PRODUCTS_DIR=\"${BASH_REMATCH[1]}${SF_OTHER_PLATFORM}\"\nelse\necho \"Could not find platform name from build products directory: $BUILT_PRODUCTS_DIR\"\nexit 1\nfi\n\n# Build the other platform.\nxcrun xcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" -configuration \"${CONFIGURATION}\" -sdk ${SF_OTHER_PLATFORM}${SF_SDK_VERSION} ${ARCH_FLAGS} BUILD_DIR=\"${BUILD_DIR}\" OBJROOT=\"${OBJROOT}\" BUILD_ROOT=\"${BUILD_ROOT}\" SYMROOT=\"${SYMROOT}\" $ACTION\n\n# define output folder environment variable\nUNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/${CONFIGURATION}-universal\n\n# create the output directories\nmkdir -p \"${UNIVERSAL_OUTPUTFOLDER}/${SF_WRAPPER_NAME}/Versions/${FRAMEWORK_VERSION}\"\n\n\n# Copy the headers into the framework directory\n# The -a ensures that the headers maintain the source modification date so that we don't constantly\n# cause propagating rebuilds of files that import these headers.\n/bin/cp -a \"${BUILT_PRODUCTS_DIR}/Headers\" \"${UNIVERSAL_OUTPUTFOLDER}/${SF_WRAPPER_NAME}/Versions/${FRAMEWORK_VERSION}/Headers\"\n\n# Copy the products to the universal folder.\n\n# Smash the two static libraries into one fat binary and store it in the .framework\nxcrun lipo -create -output \"${UNIVERSAL_OUTPUTFOLDER}/${SF_WRAPPER_NAME}/Versions/${FRAMEWORK_VERSION}/${SF_EXECUTABLE_NAME}\" \"${SF_OTHER_BUILT_PRODUCTS_DIR}/${SF_EXECUTABLE_NAME}\" \"${BUILT_PRODUCTS_DIR}/${SF_EXECUTABLE_NAME}\"\n\n# Link the \"Current\" version to \"${FRAMEWORK_VERSION}\"\npushd \"${UNIVERSAL_OUTPUTFOLDER}/${SF_WRAPPER_NAME}/Versions\"\n/bin/ln -sfh \"${FRAMEWORK_VERSION}\" Current\npopd\n\n# Link the top level lib and header directories.\npushd \"${UNIVERSAL_OUTPUTFOLDER}/${SF_WRAPPER_NAME}\"\n/bin/ln -sfh Versions/Current/Headers Headers\n/bin/ln -sfh \"Versions/Current/${EXECUTABLE_PREFIX}${PRODUCT_NAME}.${EXECUTABLE_EXTENSION}\" \"${EXECUTABLE_PREFIX}${PRODUCT_NAME}.${EXECUTABLE_EXTENSION}\"\npopd";
264+
+ shellScript = "set -e\nset +u\n# Avoid recursively calling this script.\nif [[ $SF_MASTER_SCRIPT_RUNNING ]]\nthen\nexit 0\nfi\nset -u\nexport SF_MASTER_SCRIPT_RUNNING=1\n\nSF_EXECUTABLE_NAME=\"${EXECUTABLE_PREFIX}${PRODUCT_NAME}.${EXECUTABLE_EXTENSION}\"\nSF_WRAPPER_NAME=\"${PRODUCT_NAME}.framework\"\n\n# The following conditionals come from\n# https://github.com/kstenerud/iOS-Universal-Framework\n\nif [[ \"$SDK_NAME\" =~ ([A-Za-z]+) ]]\nthen\nSF_SDK_PLATFORM=${BASH_REMATCH[1]}\nelse\necho \"Could not find platform name from SDK_NAME: $SDK_NAME\"\nexit 1\nfi\n\nif [[ \"$SDK_NAME\" =~ ([0-9]+.*$) ]]\nthen\nSF_SDK_VERSION=${BASH_REMATCH[1]}\nelse\necho \"Could not find sdk version from SDK_NAME: $SDK_NAME\"\nexit 1\nfi\n\nif [[ \"$SF_SDK_PLATFORM\" = \"iphoneos\" ]]\nthen\nSF_OTHER_PLATFORM=iphonesimulator\nARCH_FLAGS=\"-arch i386\"\nelse\nSF_OTHER_PLATFORM=iphoneos\nARCH_FLAGS=\"\"\nfi\n\nif [[ \"$BUILT_PRODUCTS_DIR\" =~ (.*)$SF_SDK_PLATFORM$ ]]\nthen\nSF_OTHER_BUILT_PRODUCTS_DIR=\"${BASH_REMATCH[1]}${SF_OTHER_PLATFORM}\"\nelse\necho \"Could not find platform name from build products directory: $BUILT_PRODUCTS_DIR\"\nexit 1\nfi\n\n# Build the other platform.\nxcrun xcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" -configuration \"${CONFIGURATION}\" -sdk ${SF_OTHER_PLATFORM}${SF_SDK_VERSION} ${ARCH_FLAGS} BUILD_DIR=\"${BUILD_DIR}\" OBJROOT=\"${OBJROOT}\" BUILD_ROOT=\"${BUILD_ROOT}\" SYMROOT=\"${SYMROOT}\" $ACTION\n\n# define output folder environment variable\nUNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/${CONFIGURATION}-universal\n\n# create the output directories\nmkdir -p \"${UNIVERSAL_OUTPUTFOLDER}/${SF_WRAPPER_NAME}/Versions/${FRAMEWORK_VERSION}\"\n\n\n# Copy the headers into the framework directory\n# The -a ensures that the headers maintain the source modification date so that we don't constantly\n# cause propagating rebuilds of files that import these headers.\n/bin/cp -a \"${BUILT_PRODUCTS_DIR}/Headers\" \"${UNIVERSAL_OUTPUTFOLDER}/${SF_WRAPPER_NAME}/Versions/${FRAMEWORK_VERSION}/Headers\"\n\n# Copy the products to the universal folder.\n\n# Smash the two static libraries into one fat binary and store it in the .framework\nxcrun lipo -create -output \"${UNIVERSAL_OUTPUTFOLDER}/${SF_WRAPPER_NAME}/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\" \"${SF_OTHER_BUILT_PRODUCTS_DIR}/${SF_EXECUTABLE_NAME}\" \"${BUILT_PRODUCTS_DIR}/${SF_EXECUTABLE_NAME}\"\n\n# Link the \"Current\" version to \"${FRAMEWORK_VERSION}\"\npushd \"${UNIVERSAL_OUTPUTFOLDER}/${SF_WRAPPER_NAME}/Versions\"\n/bin/ln -sfh \"${FRAMEWORK_VERSION}\" Current\npopd\n\n# Link the top level lib and header directories.\npushd \"${UNIVERSAL_OUTPUTFOLDER}/${SF_WRAPPER_NAME}\"\n/bin/ln -sfh Versions/Current/Headers Headers\n/bin/ln -sfh \"Versions/Current/${PRODUCT_NAME}\" \"${PRODUCT_NAME}\"\npopd";
265265
};
266266
- 6C43CC3F1534FF1B00162364 /* Generate Source and Headers */ = {
267267
+ 6C43CC3E1534F8E200162364 /* Generate Trampoline */ = {

0 commit comments

Comments
 (0)