traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #25798: Update OS X 10.5+ 32-bit-only installer to build 

and link with OpenSSL 1.0.2e.
This commit is contained in:
Ned Deily 2015-12-05 23:51:23 -05:00
parent f7fdbdab5b
commit 6364094f49
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mac/BuildScript/build-installer.py
View File

@ -237,9 +237,9 @@ def library_recipes():
result.extend([ result.extend([
dict( dict(
name="OpenSSL 1.0.2d", name="OpenSSL 1.0.2e",
url="https://www.openssl.org/source/openssl-1.0.2d.tar.gz", url="https://www.openssl.org/source/openssl-1.0.2e.tar.gz",
checksum='38dd619b2e77cbac69b99f52a053d25a', checksum='5262bfa25b60ed9de9f28d5d52d77fc5',
patches=[ patches=[
"openssl_sdk_makedepend.patch", "openssl_sdk_makedepend.patch",
], ],

18
Mac/BuildScript/openssl_sdk_makedepend.patch
View File

@ -1,8 +1,8 @@
# HG changeset patch # HG changeset patch
# Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43 # Parent ff8a7557607cffd626997e57ed31c1012a3018aa
# openssl_sdk_makedepend.patch # openssl_sdk_makedepend.patch
# #
# using openssl 1.0.2d # using openssl 1.0.2e
# #
# - support building with an OS X SDK # - support building with an OS X SDK
# - allow "make depend" to use compilers with names other than "gcc" # - allow "make depend" to use compilers with names other than "gcc"
@ -12,7 +12,7 @@ diff Configure
diff --git a/Configure b/Configure diff --git a/Configure b/Configure
--- a/Configure --- a/Configure
+++ b/Configure +++ b/Configure
@@ -617,12 +617,12 @@ @@ -635,12 +635,12 @@
##### MacOS X (a.k.a. Rhapsody or Darwin) setup ##### MacOS X (a.k.a. Rhapsody or Darwin) setup
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
@ -31,24 +31,26 @@ diff --git a/Configure b/Configure
"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", "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/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", "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",
@@ -1685,7 +1685,7 @@ @@ -1714,8 +1714,7 @@
s/^CC=.*$/CC= $cc/; s/^CC=.*$/CC= $cc/;
s/^AR=\s*ar/AR= $ar/; s/^AR=\s*ar/AR= $ar/;
s/^RANLIB=.*/RANLIB= $ranlib/; s/^RANLIB=.*/RANLIB= $ranlib/;
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc"; - s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
+ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/; - s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
+ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/
} }
s/^CFLAG=.*$/CFLAG= $cflags/; s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG=$depflags/; s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
diff --git a/util/domd b/util/domd diff --git a/util/domd b/util/domd
--- a/util/domd --- a/util/domd
+++ b/util/domd +++ b/util/domd
@@ -14,7 +14,7 @@ @@ -14,8 +14,7 @@
cp Makefile Makefile.save cp Makefile Makefile.save
# fake the presence of Kerberos # fake the presence of Kerberos
touch $TOP/krb5.h touch $TOP/krb5.h
-if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then -if ${MAKEDEPEND} --version 2>&1 | grep -q "clang" ||
+if true ; then # was: if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then - echo $MAKEDEPEND | grep -q "gcc"; then
+if true ; then
args="" args=""
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
if [ "$1" != "--" ]; then args="$args $1"; fi if [ "$1" != "--" ]; then args="$args $1"; fi

4
Misc/NEWS
View File

@ -745,8 +745,8 @@ Build
- Issue #23445: pydebug builds now use "gcc -Og" where possible, to make - Issue #23445: pydebug builds now use "gcc -Og" where possible, to make
the resulting executable faster. the resulting executable faster.
- Issue #24603: Update Windows builds and OS X 10.5 installer to use OpenSSL - Issue #24603: Update Windows builds to use OpenSSL1.0.2d
1.0.2d. and OS X 10.5 installer to use OpenSSL 1.0.2e.
C API C API
----- -----