fixes hostlibffi for latest xcode (removes 32 bits compilation unsupported by xcode, and fixes cache issues within xcode)
This commit is contained in:
Mathieu Virbel
parent
aa01292d81
commit
5a60fa58fe
3 changed files with 407 additions and 8 deletions
|
|
@ -1,5 +1,6 @@
|
||||||
from toolchain import Recipe, shprint
|
from toolchain import Recipe, shprint
|
||||||
import sh
|
import sh
|
||||||
|
from os.path import exists
|
||||||
|
|
||||||
|
|
||||||
class LibffiRecipe(Recipe):
|
class LibffiRecipe(Recipe):
|
||||||
|
|
@ -31,22 +32,29 @@ class LibffiRecipe(Recipe):
|
||||||
self.apply_patch("public_include.patch")
|
self.apply_patch("public_include.patch")
|
||||||
self.apply_patch("staticlib.patch")
|
self.apply_patch("staticlib.patch")
|
||||||
self.apply_patch("staticlib2.patch")
|
self.apply_patch("staticlib2.patch")
|
||||||
|
self.apply_patch("libffi-xcode10.patch")
|
||||||
self.set_marker("patched")
|
self.set_marker("patched")
|
||||||
|
|
||||||
def build_arch(self, arch):
|
def build_arch(self, arch):
|
||||||
shprint(sh.xcodebuild, self.ctx.concurrent_xcodebuild,
|
if exists("generate-darwin-source-and-headers.py"):
|
||||||
|
shprint(
|
||||||
|
sh.mv,
|
||||||
|
"generate-darwin-source-and-headers.py",
|
||||||
|
"_generate-darwin-source-and-headers.py")
|
||||||
|
shprint(sh.touch, "generate-darwin-source-and-headers.py")
|
||||||
|
shprint(sh.python2, "_generate-darwin-source-and-headers.py", "--only-osx")
|
||||||
|
shprint(sh.xcodebuild,
|
||||||
|
self.ctx.concurrent_xcodebuild,
|
||||||
"ONLY_ACTIVE_ARCH=NO",
|
"ONLY_ACTIVE_ARCH=NO",
|
||||||
"ARCHS={}".format(arch.arch),
|
"ARCHS={}".format(arch.arch),
|
||||||
|
"DSTROOT={}/hostlibffi".format(self.ctx.dist_dir),
|
||||||
"-sdk", "macosx",
|
"-sdk", "macosx",
|
||||||
"install", "installhdrs",
|
"clean", "build", "installhdrs", "install",
|
||||||
"-project", "libffi.xcodeproj",
|
"-project", "libffi.xcodeproj",
|
||||||
"-target", "libffi-Mac",
|
"-scheme", "libffi-Mac",
|
||||||
"-configuration", "Release",
|
"-configuration", "Release")
|
||||||
"DSTROOT={}/hostlibffi".format(self.ctx.dist_dir))
|
|
||||||
|
|
||||||
|
|
||||||
def postbuild_arch(self, arch):
|
def postbuild_arch(self, arch):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
recipe = LibffiRecipe()
|
recipe = LibffiRecipe()
|
||||||
|
|
||||||
|
|
|
||||||
391
recipes/hostlibffi/libffi-xcode10.patch
Normal file
391
recipes/hostlibffi/libffi-xcode10.patch
Normal file
|
|
@ -0,0 +1,391 @@
|
||||||
|
--- libffi-3.2.1.old/generate-darwin-source-and-headers.py 2018-10-26 17:08:07.000000000 +0200
|
||||||
|
+++ libffi-3.2.1/generate-darwin-source-and-headers.py 2018-10-26 17:08:50.000000000 +0200
|
||||||
|
@@ -174,23 +174,23 @@
|
||||||
|
|
||||||
|
if generate_ios:
|
||||||
|
make_tramp()
|
||||||
|
- copy_src_platform_files(simulator_platform)
|
||||||
|
+ #copy_src_platform_files(simulator_platform)
|
||||||
|
copy_src_platform_files(simulator64_platform)
|
||||||
|
copy_src_platform_files(device_platform)
|
||||||
|
copy_src_platform_files(device64_platform)
|
||||||
|
if generate_osx:
|
||||||
|
- copy_src_platform_files(desktop32_platform)
|
||||||
|
+ #copy_src_platform_files(desktop32_platform)
|
||||||
|
copy_src_platform_files(desktop64_platform)
|
||||||
|
|
||||||
|
platform_headers = collections.defaultdict(set)
|
||||||
|
|
||||||
|
if generate_ios:
|
||||||
|
- build_target(simulator_platform, platform_headers)
|
||||||
|
+ #build_target(simulator_platform, platform_headers)
|
||||||
|
build_target(simulator64_platform, platform_headers)
|
||||||
|
build_target(device_platform, platform_headers)
|
||||||
|
build_target(device64_platform, platform_headers)
|
||||||
|
if generate_osx:
|
||||||
|
- build_target(desktop32_platform, platform_headers)
|
||||||
|
+ #build_target(desktop32_platform, platform_headers)
|
||||||
|
build_target(desktop64_platform, platform_headers)
|
||||||
|
|
||||||
|
mkdir_p('darwin_common/include')
|
||||||
|
--- libffi-3.2.1.old/configure 2014-11-12 12:59:57.000000000 +0100
|
||||||
|
+++ libffi-3.2.1/configure 2018-10-26 09:02:12.000000000 +0200
|
||||||
|
@@ -18725,11 +18725,11 @@
|
||||||
|
toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
|
||||||
|
toolexeclibdir="${libdir}"
|
||||||
|
fi
|
||||||
|
- multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
|
||||||
|
- case $multi_os_directory in
|
||||||
|
- .) ;; # Avoid trailing /.
|
||||||
|
- ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
|
||||||
|
- esac
|
||||||
|
+ # multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
|
||||||
|
+ # case $multi_os_directory in
|
||||||
|
+ # .) ;; # Avoid trailing /.
|
||||||
|
+ # ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
|
||||||
|
+ # esac
|
||||||
|
|
||||||
|
else
|
||||||
|
toolexeclibdir="${libdir}"
|
||||||
|
--- libffi-3.2.1.old/configure.ac 2014-11-12 12:56:51.000000000 +0100
|
||||||
|
+++ libffi-3.2.1/configure.ac 2018-10-26 09:00:50.000000000 +0200
|
||||||
|
@@ -601,11 +601,11 @@
|
||||||
|
toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
|
||||||
|
toolexeclibdir="${libdir}"
|
||||||
|
fi
|
||||||
|
- multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
|
||||||
|
- case $multi_os_directory in
|
||||||
|
- .) ;; # Avoid trailing /.
|
||||||
|
- ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
|
||||||
|
- esac
|
||||||
|
+ # multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
|
||||||
|
+ # case $multi_os_directory in
|
||||||
|
+ # .) ;; # Avoid trailing /.
|
||||||
|
+ # ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
|
||||||
|
+ # esac
|
||||||
|
AC_SUBST(toolexecdir)
|
||||||
|
else
|
||||||
|
toolexeclibdir="${libdir}"
|
||||||
|
--- libffi-3.2.1.old/libffi.xcodeproj/project.pbxproj 2018-10-26 17:31:30.000000000 +0200
|
||||||
|
+++ libffi-3.2.1/libffi.xcodeproj/project.pbxproj 2018-10-26 17:30:17.000000000 +0200
|
||||||
|
@@ -24,20 +24,11 @@
|
||||||
|
DBFA7179187F1D9B00A76262 /* ffi_armv7.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA716F187F1D9B00A76262 /* ffi_armv7.c */; };
|
||||||
|
DBFA717A187F1D9B00A76262 /* sysv_armv7.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7170187F1D9B00A76262 /* sysv_armv7.S */; };
|
||||||
|
DBFA717B187F1D9B00A76262 /* trampoline_armv7.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7171187F1D9B00A76262 /* trampoline_armv7.S */; };
|
||||||
|
- DBFA717C187F1D9B00A76262 /* darwin64_x86_64.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7173187F1D9B00A76262 /* darwin64_x86_64.S */; };
|
||||||
|
- DBFA717D187F1D9B00A76262 /* darwin_i386.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7174187F1D9B00A76262 /* darwin_i386.S */; };
|
||||||
|
- DBFA717E187F1D9B00A76262 /* ffi64_x86_64.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7175187F1D9B00A76262 /* ffi64_x86_64.c */; };
|
||||||
|
- DBFA717F187F1D9B00A76262 /* ffi_i386.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA7176187F1D9B00A76262 /* ffi_i386.c */; };
|
||||||
|
- DBFA718E187F1DA100A76262 /* ffi_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7182187F1DA100A76262 /* ffi_i386.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||||
|
DBFA718F187F1DA100A76262 /* ffi_x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7183187F1DA100A76262 /* ffi_x86_64.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||||
|
- DBFA7190187F1DA100A76262 /* fficonfig_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7184187F1DA100A76262 /* fficonfig_i386.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||||
|
DBFA7191187F1DA100A76262 /* fficonfig_x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7185187F1DA100A76262 /* fficonfig_x86_64.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||||
|
- DBFA7192187F1DA100A76262 /* ffitarget_i386.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7186187F1DA100A76262 /* ffitarget_i386.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||||
|
DBFA7193187F1DA100A76262 /* ffitarget_x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = DBFA7187187F1DA100A76262 /* ffitarget_x86_64.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||||
|
DBFA7194187F1DA100A76262 /* darwin64_x86_64.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA718A187F1DA100A76262 /* darwin64_x86_64.S */; };
|
||||||
|
- DBFA7195187F1DA100A76262 /* darwin_i386.S in Sources */ = {isa = PBXBuildFile; fileRef = DBFA718B187F1DA100A76262 /* darwin_i386.S */; };
|
||||||
|
DBFA7196187F1DA100A76262 /* ffi64_x86_64.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA718C187F1DA100A76262 /* ffi64_x86_64.c */; };
|
||||||
|
- DBFA7197187F1DA100A76262 /* ffi_i386.c in Sources */ = {isa = PBXBuildFile; fileRef = DBFA718D187F1DA100A76262 /* ffi_i386.c */; };
|
||||||
|
/* End PBXBuildFile section */
|
||||||
|
|
||||||
|
/* Begin PBXCopyFilesBuildPhase section */
|
||||||
|
@@ -81,20 +72,11 @@
|
||||||
|
DBFA716F187F1D9B00A76262 /* ffi_armv7.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi_armv7.c; sourceTree = "<group>"; };
|
||||||
|
DBFA7170187F1D9B00A76262 /* sysv_armv7.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = sysv_armv7.S; sourceTree = "<group>"; };
|
||||||
|
DBFA7171187F1D9B00A76262 /* trampoline_armv7.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = trampoline_armv7.S; sourceTree = "<group>"; };
|
||||||
|
- DBFA7173187F1D9B00A76262 /* darwin64_x86_64.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin64_x86_64.S; sourceTree = "<group>"; };
|
||||||
|
- DBFA7174187F1D9B00A76262 /* darwin_i386.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin_i386.S; sourceTree = "<group>"; };
|
||||||
|
- DBFA7175187F1D9B00A76262 /* ffi64_x86_64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi64_x86_64.c; sourceTree = "<group>"; };
|
||||||
|
- DBFA7176187F1D9B00A76262 /* ffi_i386.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi_i386.c; sourceTree = "<group>"; };
|
||||||
|
- DBFA7182187F1DA100A76262 /* ffi_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_i386.h; sourceTree = "<group>"; };
|
||||||
|
DBFA7183187F1DA100A76262 /* ffi_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_x86_64.h; sourceTree = "<group>"; };
|
||||||
|
- DBFA7184187F1DA100A76262 /* fficonfig_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_i386.h; sourceTree = "<group>"; };
|
||||||
|
DBFA7185187F1DA100A76262 /* fficonfig_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig_x86_64.h; sourceTree = "<group>"; };
|
||||||
|
- DBFA7186187F1DA100A76262 /* ffitarget_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_i386.h; sourceTree = "<group>"; };
|
||||||
|
DBFA7187187F1DA100A76262 /* ffitarget_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffitarget_x86_64.h; sourceTree = "<group>"; };
|
||||||
|
DBFA718A187F1DA100A76262 /* darwin64_x86_64.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin64_x86_64.S; sourceTree = "<group>"; };
|
||||||
|
- DBFA718B187F1DA100A76262 /* darwin_i386.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = darwin_i386.S; sourceTree = "<group>"; };
|
||||||
|
DBFA718C187F1DA100A76262 /* ffi64_x86_64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi64_x86_64.c; sourceTree = "<group>"; };
|
||||||
|
- DBFA718D187F1DA100A76262 /* ffi_i386.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffi_i386.c; sourceTree = "<group>"; };
|
||||||
|
/* End PBXFileReference section */
|
||||||
|
|
||||||
|
/* Begin PBXGroup section */
|
||||||
|
@@ -182,7 +164,6 @@
|
||||||
|
children = (
|
||||||
|
DBFA716B187F1D9B00A76262 /* aarch64 */,
|
||||||
|
DBFA716E187F1D9B00A76262 /* arm */,
|
||||||
|
- DBFA7172187F1D9B00A76262 /* x86 */,
|
||||||
|
);
|
||||||
|
path = src;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
@@ -206,17 +187,6 @@
|
||||||
|
path = arm;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
};
|
||||||
|
- DBFA7172187F1D9B00A76262 /* x86 */ = {
|
||||||
|
- isa = PBXGroup;
|
||||||
|
- children = (
|
||||||
|
- DBFA7173187F1D9B00A76262 /* darwin64_x86_64.S */,
|
||||||
|
- DBFA7174187F1D9B00A76262 /* darwin_i386.S */,
|
||||||
|
- DBFA7175187F1D9B00A76262 /* ffi64_x86_64.c */,
|
||||||
|
- DBFA7176187F1D9B00A76262 /* ffi_i386.c */,
|
||||||
|
- );
|
||||||
|
- path = x86;
|
||||||
|
- sourceTree = "<group>";
|
||||||
|
- };
|
||||||
|
DBFA7180187F1DA100A76262 /* darwin_osx */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
@@ -229,11 +199,8 @@
|
||||||
|
DBFA7181187F1DA100A76262 /* include */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
- DBFA7182187F1DA100A76262 /* ffi_i386.h */,
|
||||||
|
DBFA7183187F1DA100A76262 /* ffi_x86_64.h */,
|
||||||
|
- DBFA7184187F1DA100A76262 /* fficonfig_i386.h */,
|
||||||
|
DBFA7185187F1DA100A76262 /* fficonfig_x86_64.h */,
|
||||||
|
- DBFA7186187F1DA100A76262 /* ffitarget_i386.h */,
|
||||||
|
DBFA7187187F1DA100A76262 /* ffitarget_x86_64.h */,
|
||||||
|
);
|
||||||
|
path = include;
|
||||||
|
@@ -251,9 +218,7 @@
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
DBFA718A187F1DA100A76262 /* darwin64_x86_64.S */,
|
||||||
|
- DBFA718B187F1DA100A76262 /* darwin_i386.S */,
|
||||||
|
DBFA718C187F1DA100A76262 /* ffi64_x86_64.c */,
|
||||||
|
- DBFA718D187F1DA100A76262 /* ffi_i386.c */,
|
||||||
|
);
|
||||||
|
path = x86;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
@@ -269,12 +234,9 @@
|
||||||
|
DBFA714D187F1D8600A76262 /* ffitarget.h in Headers */,
|
||||||
|
DBFA714B187F1D8600A76262 /* ffi_common.h in Headers */,
|
||||||
|
DBFA718F187F1DA100A76262 /* ffi_x86_64.h in Headers */,
|
||||||
|
- DBFA718E187F1DA100A76262 /* ffi_i386.h in Headers */,
|
||||||
|
- DBFA7192187F1DA100A76262 /* ffitarget_i386.h in Headers */,
|
||||||
|
DBFA7193187F1DA100A76262 /* ffitarget_x86_64.h in Headers */,
|
||||||
|
DBFA714C187F1D8600A76262 /* fficonfig.h in Headers */,
|
||||||
|
DBFA7191187F1DA100A76262 /* fficonfig_x86_64.h in Headers */,
|
||||||
|
- DBFA7190187F1DA100A76262 /* fficonfig_i386.h in Headers */,
|
||||||
|
);
|
||||||
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
};
|
||||||
|
@@ -321,7 +283,7 @@
|
||||||
|
DB13B15C1849DEB70010F42D /* Project object */ = {
|
||||||
|
isa = PBXProject;
|
||||||
|
attributes = {
|
||||||
|
- LastUpgradeCheck = 0510;
|
||||||
|
+ LastUpgradeCheck = 1000;
|
||||||
|
};
|
||||||
|
buildConfigurationList = DB13B15F1849DEB70010F42D /* Build configuration list for PBXProject "libffi" */;
|
||||||
|
compatibilityVersion = "Xcode 3.2";
|
||||||
|
@@ -366,7 +328,7 @@
|
||||||
|
);
|
||||||
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
shellPath = /bin/sh;
|
||||||
|
- shellScript = "/usr/bin/python generate-darwin-source-and-headers.py --only-osx";
|
||||||
|
+ shellScript = "/usr/bin/python generate-darwin-source-and-headers.py --only-osx\n";
|
||||||
|
};
|
||||||
|
/* End PBXShellScriptBuildPhase section */
|
||||||
|
|
||||||
|
@@ -375,17 +337,13 @@
|
||||||
|
isa = PBXSourcesBuildPhase;
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
files = (
|
||||||
|
- DBFA717E187F1D9B00A76262 /* ffi64_x86_64.c in Sources */,
|
||||||
|
DBFA7179187F1D9B00A76262 /* ffi_armv7.c in Sources */,
|
||||||
|
DBFA717B187F1D9B00A76262 /* trampoline_armv7.S in Sources */,
|
||||||
|
DBFA714E187F1D8600A76262 /* closures.c in Sources */,
|
||||||
|
DBFA717A187F1D9B00A76262 /* sysv_armv7.S in Sources */,
|
||||||
|
- DBFA717D187F1D9B00A76262 /* darwin_i386.S in Sources */,
|
||||||
|
DBFA7156187F1D8600A76262 /* prep_cif.c in Sources */,
|
||||||
|
- DBFA717F187F1D9B00A76262 /* ffi_i386.c in Sources */,
|
||||||
|
DBFA7158187F1D8600A76262 /* raw_api.c in Sources */,
|
||||||
|
DBFA7178187F1D9B00A76262 /* sysv_arm64.S in Sources */,
|
||||||
|
- DBFA717C187F1D9B00A76262 /* darwin64_x86_64.S in Sources */,
|
||||||
|
DBFA715A187F1D8600A76262 /* types.c in Sources */,
|
||||||
|
DBFA7177187F1D9B00A76262 /* ffi_arm64.c in Sources */,
|
||||||
|
);
|
||||||
|
@@ -396,9 +354,7 @@
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
files = (
|
||||||
|
DBFA7196187F1DA100A76262 /* ffi64_x86_64.c in Sources */,
|
||||||
|
- DBFA7195187F1DA100A76262 /* darwin_i386.S in Sources */,
|
||||||
|
DBFA7157187F1D8600A76262 /* prep_cif.c in Sources */,
|
||||||
|
- DBFA7197187F1DA100A76262 /* ffi_i386.c in Sources */,
|
||||||
|
DBFA715B187F1D8600A76262 /* types.c in Sources */,
|
||||||
|
DBFA7159187F1D8600A76262 /* raw_api.c in Sources */,
|
||||||
|
DBFA714F187F1D8600A76262 /* closures.c in Sources */,
|
||||||
|
@@ -412,21 +368,74 @@
|
||||||
|
DB13B1601849DEB70010F42D /* Debug */ = {
|
||||||
|
isa = XCBuildConfiguration;
|
||||||
|
buildSettings = {
|
||||||
|
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||||
|
+ CLANG_WARN_BOOL_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_COMMA = YES;
|
||||||
|
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||||
|
+ CLANG_WARN_EMPTY_BODY = YES;
|
||||||
|
+ CLANG_WARN_ENUM_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_INFINITE_RECURSION = YES;
|
||||||
|
+ CLANG_WARN_INT_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||||
|
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||||
|
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||||
|
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||||
|
+ CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||||
|
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||||
|
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||||
|
+ ENABLE_TESTABILITY = YES;
|
||||||
|
+ GCC_NO_COMMON_BLOCKS = YES;
|
||||||
|
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||||
|
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||||
|
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||||
|
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
|
||||||
|
+ GCC_WARN_UNUSED_FUNCTION = YES;
|
||||||
|
+ GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
|
HEADER_SEARCH_PATHS = (
|
||||||
|
"$(inherited)",
|
||||||
|
darwin_common/include,
|
||||||
|
);
|
||||||
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
|
+ VALID_ARCHS = x86_64;
|
||||||
|
};
|
||||||
|
name = Debug;
|
||||||
|
};
|
||||||
|
DB13B1611849DEB70010F42D /* Release */ = {
|
||||||
|
isa = XCBuildConfiguration;
|
||||||
|
buildSettings = {
|
||||||
|
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||||
|
+ CLANG_WARN_BOOL_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_COMMA = YES;
|
||||||
|
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
||||||
|
+ CLANG_WARN_EMPTY_BODY = YES;
|
||||||
|
+ CLANG_WARN_ENUM_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_INFINITE_RECURSION = YES;
|
||||||
|
+ CLANG_WARN_INT_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||||
|
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||||
|
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||||
|
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||||
|
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||||
|
+ CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||||
|
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||||
|
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||||
|
+ GCC_NO_COMMON_BLOCKS = YES;
|
||||||
|
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||||
|
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||||
|
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||||
|
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
|
||||||
|
+ GCC_WARN_UNUSED_FUNCTION = YES;
|
||||||
|
+ GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
|
HEADER_SEARCH_PATHS = (
|
||||||
|
"$(inherited)",
|
||||||
|
darwin_common/include,
|
||||||
|
);
|
||||||
|
+ VALID_ARCHS = x86_64;
|
||||||
|
};
|
||||||
|
name = Release;
|
||||||
|
};
|
||||||
|
@@ -434,7 +443,6 @@
|
||||||
|
isa = XCBuildConfiguration;
|
||||||
|
buildSettings = {
|
||||||
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
|
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
|
||||||
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||||
|
CLANG_CXX_LIBRARY = "libc++";
|
||||||
|
CLANG_ENABLE_MODULES = YES;
|
||||||
|
@@ -467,7 +475,7 @@
|
||||||
|
"$(inherited)",
|
||||||
|
darwin_ios/include,
|
||||||
|
);
|
||||||
|
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
|
||||||
|
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||||
|
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0;
|
||||||
|
OTHER_LDFLAGS = "-ObjC";
|
||||||
|
PRODUCT_NAME = ffi;
|
||||||
|
@@ -480,7 +488,6 @@
|
||||||
|
isa = XCBuildConfiguration;
|
||||||
|
buildSettings = {
|
||||||
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
|
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
|
||||||
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||||
|
CLANG_CXX_LIBRARY = "libc++";
|
||||||
|
CLANG_ENABLE_MODULES = YES;
|
||||||
|
@@ -507,7 +514,7 @@
|
||||||
|
"$(inherited)",
|
||||||
|
darwin_ios/include,
|
||||||
|
);
|
||||||
|
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
|
||||||
|
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||||
|
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0;
|
||||||
|
OTHER_LDFLAGS = "-ObjC";
|
||||||
|
PRODUCT_NAME = ffi;
|
||||||
|
--- libffi-3.2.1.old/libffi.xcodeproj/project.pbxproj.orig 2018-10-26 17:31:30.000000000 +0200
|
||||||
|
+++ libffi-3.2.1/libffi.xcodeproj/project.pbxproj.orig 2018-10-26 17:27:16.000000000 +0200
|
||||||
|
@@ -54,7 +54,7 @@
|
||||||
|
|
||||||
|
/* Begin PBXFileReference section */
|
||||||
|
DB13B1661849DF1E0010F42D /* libffi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libffi.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
|
- DB13B1911849DF510010F42D /* ffi.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = ffi.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
|
+ DB13B1911849DF510010F42D /* libffi.a */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libffi.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
|
DBFA713E187F1D8600A76262 /* ffi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi.h; sourceTree = "<group>"; };
|
||||||
|
DBFA713F187F1D8600A76262 /* ffi_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ffi_common.h; sourceTree = "<group>"; };
|
||||||
|
DBFA7140187F1D8600A76262 /* fficonfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fficonfig.h; sourceTree = "<group>"; };
|
||||||
|
@@ -112,7 +112,7 @@
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
DB13B1661849DF1E0010F42D /* libffi.a */,
|
||||||
|
- DB13B1911849DF510010F42D /* ffi.dylib */,
|
||||||
|
+ DB13B1911849DF510010F42D /* libffi.a */,
|
||||||
|
);
|
||||||
|
name = Products;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
@@ -312,7 +312,7 @@
|
||||||
|
);
|
||||||
|
name = "libffi-Mac";
|
||||||
|
productName = ffi;
|
||||||
|
- productReference = DB13B1911849DF510010F42D /* ffi.dylib */;
|
||||||
|
+ productReference = DB13B1911849DF510010F42D /* libffi.a */;
|
||||||
|
productType = "com.apple.product-type.library.dynamic";
|
||||||
|
};
|
||||||
|
/* End PBXNativeTarget section */
|
||||||
|
@@ -535,6 +535,7 @@
|
||||||
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DYLIB_COMPATIBILITY_VERSION = 1;
|
||||||
|
DYLIB_CURRENT_VERSION = 1;
|
||||||
|
+ EXECUTABLE_EXTENSION = a;
|
||||||
|
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||||
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
|
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
|
||||||
|
@@ -558,7 +559,7 @@
|
||||||
|
MACOSX_DEPLOYMENT_TARGET = 10.6;
|
||||||
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
|
OTHER_LDFLAGS = "-Wl,-no_compact_unwind";
|
||||||
|
- PRODUCT_NAME = ffi;
|
||||||
|
+ PRODUCT_NAME = libffi;
|
||||||
|
SDKROOT = macosx;
|
||||||
|
};
|
||||||
|
name = Debug;
|
||||||
|
@@ -583,6 +584,7 @@
|
||||||
|
DYLIB_COMPATIBILITY_VERSION = 1;
|
||||||
|
DYLIB_CURRENT_VERSION = 1;
|
||||||
|
ENABLE_NS_ASSERTIONS = NO;
|
||||||
|
+ EXECUTABLE_EXTENSION = a;
|
||||||
|
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||||
|
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
|
||||||
|
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||||
|
@@ -598,7 +600,7 @@
|
||||||
|
MACH_O_TYPE = staticlib;
|
||||||
|
MACOSX_DEPLOYMENT_TARGET = 10.6;
|
||||||
|
OTHER_LDFLAGS = "-Wl,-no_compact_unwind";
|
||||||
|
- PRODUCT_NAME = ffi;
|
||||||
|
+ PRODUCT_NAME = libffi;
|
||||||
|
SDKROOT = macosx;
|
||||||
|
};
|
||||||
|
name = Release;
|
||||||
|
|
@ -327,7 +327,7 @@ class Context(object):
|
||||||
self.install_dir = "{}/dist/root".format(self.root_dir)
|
self.install_dir = "{}/dist/root".format(self.root_dir)
|
||||||
self.include_dir = "{}/dist/include".format(self.root_dir)
|
self.include_dir = "{}/dist/include".format(self.root_dir)
|
||||||
self.archs = (
|
self.archs = (
|
||||||
ArchSimulator(self),
|
# ArchSimulator(self),
|
||||||
Arch64Simulator(self),
|
Arch64Simulator(self),
|
||||||
ArchIOS(self),
|
ArchIOS(self),
|
||||||
Arch64IOS(self))
|
Arch64IOS(self))
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue