diff options
| author | Sam Bingner <sam@bingner.com> | 2019-05-06 12:05:00 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2019-05-06 12:05:00 -1000 |
| commit | de31ee7f21b9b2c8f84699fc1c17e0de02d976e8 (patch) | |
| tree | 69114c0244df12a9000bd23e151f6a19ae038579 | |
| parent | 03373a3d83d8c8d6cbc6e0a74b3434ef695e4c22 (diff) | |
Some changes to support compiling for watchos
| -rw-r--r-- | data/_openssl1.0/iphoneos.diff | 7 | ||||
| -rw-r--r-- | data/libgpg-error/triplet.diff | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/data/_openssl1.0/iphoneos.diff b/data/_openssl1.0/iphoneos.diff index 3e22940fd..6dfc5ea46 100644 --- a/data/_openssl1.0/iphoneos.diff +++ b/data/_openssl1.0/iphoneos.diff @@ -1,12 +1,13 @@ diff -ur openssl-1.0.2o/Configure openssl-1.0.2o+iPhone/Configure --- openssl-1.0.2o/Configure 2018-03-27 03:54:46.000000000 -1000 +++ openssl-1.0.2o+iPhone/Configure 2018-07-24 11:49:38.000000000 -1000 -@@ -652,7 +652,8 @@ +@@ -652,7 +652,9 @@ "debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", # iPhoneOS/iOS -"iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +"arm-apple-darwin11","arm-apple-darwin11-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"armv7k-apple-darwin11","armv7k-apple-darwin11-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +"aarch64-apple-darwin17","aarch64-apple-darwin17-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ##### A/UX @@ -14,7 +15,7 @@ diff -ur openssl-1.0.2o/Configure openssl-1.0.2o+iPhone/Configure diff -ur openssl-1.0.2o/config openssl-1.0.2o+iPhone/config --- openssl-1.0.2o/config 2018-03-27 03:54:46.000000000 -1000 +++ openssl-1.0.2o+iPhone/config 2018-07-24 11:54:37.000000000 -1000 -@@ -578,9 +578,10 @@ +@@ -578,9 +578,12 @@ armv6+7-*-iphoneos) options="$options -arch%20armv6 -arch%20armv7" OUT="iphoneos-cross" ;; @@ -25,6 +26,8 @@ diff -ur openssl-1.0.2o/config openssl-1.0.2o+iPhone/config + OUT="iphoneos-arm" ;; + aarch64-apple-darwin17) + OUT="iphoneos-arm" ;; ++ armv7k-apple-darwin11) ++ OUT="watchos-arm" ;; alpha-*-linux2) ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` case ${ISA:-generic} in diff --git a/data/libgpg-error/triplet.diff b/data/libgpg-error/triplet.diff index 42ecb5b9c..a851a83a0 100644 --- a/data/libgpg-error/triplet.diff +++ b/data/libgpg-error/triplet.diff @@ -1,11 +1,12 @@ diff -ur libgpg-error-1.32/src/mkheader.c libgpg-error-1.32+iPhone/src/mkheader.c --- libgpg-error-1.32/src/mkheader.c 2018-03-13 22:56:20.000000000 -1000 +++ libgpg-error-1.32+iPhone/src/mkheader.c 2018-08-01 15:13:26.000000000 -1000 -@@ -90,6 +90,9 @@ +@@ -90,6 +90,10 @@ {"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" }, {"arm-unknown-linux-gnueabihf", "arm-unknown-linux-gnueabi" }, + {"arm-apple-darwin11", "arm-apple-darwin" }, ++ {"armv7k-apple-darwin11", "arm-apple-darwin" }, + {"aarch64-apple-darwin14", "aarch64-apple-darwin" }, + {"aarch64-apple-darwin17", "aarch64-apple-darwin" }, {"armv7-unknown-linux-gnueabihf" }, |