diff options
Diffstat (limited to 'data/_openssl1.0')
| -rw-r--r-- | data/_openssl1.0/iphoneos.diff | 39 | ||||
| -rw-r--r-- | data/_openssl1.0/make.sh | 5 |
2 files changed, 18 insertions, 26 deletions
diff --git a/data/_openssl1.0/iphoneos.diff b/data/_openssl1.0/iphoneos.diff index 6dfc5ea46..67020e994 100644 --- a/data/_openssl1.0/iphoneos.diff +++ b/data/_openssl1.0/iphoneos.diff @@ -1,33 +1,24 @@ -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,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", +diff -ur openssl-1.0.2s/Configure openssl-1.0.2s+iOS/Configure +--- openssl-1.0.2s/Configure 2019-09-04 14:58:20.000000000 -1000 ++++ openssl-1.0.2s+iOS/Configure 2019-05-28 02:41:37.000000000 -1000 +@@ -654,6 +654,7 @@ "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", + "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", ++"ios-cross","\$(PKG_TARG)-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 "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", -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,12 @@ - armv6+7-*-iphoneos) - options="$options -arch%20armv6 -arch%20armv7" +diff -ur openssl-1.0.2s/config openssl-1.0.2s+iOS/config +--- openssl-1.0.2s/config 2019-09-04 14:59:51.000000000 -1000 ++++ openssl-1.0.2s+iOS/config 2019-05-28 02:41:38.000000000 -1000 +@@ -581,6 +581,9 @@ + *-*-iphoneos) + options="$options -arch%20${MACHINE}" OUT="iphoneos-cross" ;; -- *-*-iphoneos) -- options="$options -arch%20${MACHINE}" -- OUT="iphoneos-cross" ;; -+ arm-apple-darwin11) -+ OUT="iphoneos-arm" ;; -+ aarch64-apple-darwin17) -+ OUT="iphoneos-arm" ;; -+ armv7k-apple-darwin11) -+ OUT="watchos-arm" ;; ++ aarch64-*-darwin* ++ arm*-*-darwin*) ++ OUT="ios-cross" ;; alpha-*-linux2) ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` case ${ISA:-generic} in diff --git a/data/_openssl1.0/make.sh b/data/_openssl1.0/make.sh index f5c84d9f7..5642b6366 100644 --- a/data/_openssl1.0/make.sh +++ b/data/_openssl1.0/make.sh @@ -1,9 +1,10 @@ pkg:setup -echo ./Configure -D__DARWIN_UNIX03 "${PKG_TARG}" --prefix=/usr --openssldir=/usr/lib/ssl shared -./Configure -D__DARWIN_UNIX03 "${PKG_TARG}" --prefix=/usr --openssldir=/usr/lib/ssl shared +echo ./Configure -D__DARWIN_UNIX03 ios-cross --prefix=/usr --openssldir=/usr/lib/ssl shared +./Configure -D__DARWIN_UNIX03 ios-cross --prefix=/usr --openssldir=/usr/lib/ssl shared make AR="${PKG_TARG}-ar -r" -j8 make install_sw INSTALL_PREFIX="${PKG_DEST}" pkg: rm -rf /usr/lib/man /usr/lib/ssl/man pkg: mkdir -p /etc/ssl mv "${PKG_DEST}"/usr/lib/ssl/{certs,openssl.cnf,private} "${PKG_DEST}"/etc/ssl +ln -s /etc/ssl/openssl.cnf "${PKG_DEST}"/usr/lib/ssl/openssl.cnf rm -rf "${PKG_DEST}"/usr/lib/*.a |