Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
6bbf1b9a
Commit
6bbf1b9a
authored
Oct 31, 2016
by
Ned Deily
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #28248: Update macOS installer build to use OpenSSL 1.0.2j.
Original patch by Mariatta Wijaya.
parent
b5c37433
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
13 deletions
+9
-13
Mac/BuildScript/build-installer.py
Mac/BuildScript/build-installer.py
+3
-3
Mac/BuildScript/openssl_sdk_makedepend.patch
Mac/BuildScript/openssl_sdk_makedepend.patch
+5
-7
Misc/NEWS
Misc/NEWS
+1
-3
No files found.
Mac/BuildScript/build-installer.py
View file @
6bbf1b9a
...
...
@@ -242,9 +242,9 @@ def library_recipes():
result
.
extend
([
dict
(
name
=
"OpenSSL 1.0.2
h
"
,
url
=
"https://www.openssl.org/source/openssl-1.0.2
h
.tar.gz"
,
checksum
=
'9
392e65072ce4b614c1392eefc1f23d0
'
,
name
=
"OpenSSL 1.0.2
j
"
,
url
=
"https://www.openssl.org/source/openssl-1.0.2
j
.tar.gz"
,
checksum
=
'9
6322138f0b69e61b7212bc53d5e912b
'
,
patches
=
[
"openssl_sdk_makedepend.patch"
,
],
...
...
Mac/BuildScript/openssl_sdk_makedepend.patch
View file @
6bbf1b9a
#
HG changeset patch
#
Parent d377390f787c0739a3e89f669def72d7167e5108
#
openssl_sdk_makedepend.patch
#
# using openssl 1.0.2
f
# using openssl 1.0.2
j
#
# - support building with an OS X SDK
...
...
@@ -11,7 +9,7 @@ diff Configure
diff --git a/Configure b/Configure
--- a/Configure
+++ b/Configure
@@ -6
38,12 +638
,12 @@
@@ -6
42,12 +642
,12 @@
##### 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}::",
...
...
@@ -30,13 +28,13 @@ 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",
# 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",
@@ -1717,8 +1717,7 @@
s/^CC=.*$/CC= $cc/;
@@ -1728,8 +1728,7 @@
s/^AR=\s*ar/AR= $ar/;
s/^RANLIB=.*/RANLIB= $ranlib/;
s/^RC=.*/RC= $windres/;
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
+ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/
+ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/
;
}
s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
Misc/NEWS
View file @
6bbf1b9a
...
...
@@ -382,8 +382,6 @@ Library
locale
encoding
,
and
fix
get_begidx
()
and
get_endidx
()
to
return
code
point
indexes
.
-
Issue
#
26930
:
Update
Windows
builds
to
use
OpenSSL
1.0.2
h
.
-
Issue
#
27392
:
Add
loop
.
connect_accepted_socket
().
Patch
by
Jim
Fulton
.
...
...
@@ -517,7 +515,7 @@ Build
- Issue #28444: Fix missing extensions modules when cross compiling.
- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
- Issue #28248: Update Windows build
and OS X installers
to use OpenSSL 1.0.2j.
- Issue #28258: Fixed build with Estonian locale (python-config and distclean
targets in Makefile). Patch by Arfrever Frehtes Taifersar Arahesis.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment