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
35c41e8e
Commit
35c41e8e
authored
Feb 15, 2016
by
Ned Deily
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #26268: Update OS X 10.5+ installer build to use OpenSSL 1.0.2f.
parent
48507519
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
22 deletions
+8
-22
Mac/BuildScript/build-installer.py
Mac/BuildScript/build-installer.py
+3
-3
Mac/BuildScript/openssl_sdk_makedepend.patch
Mac/BuildScript/openssl_sdk_makedepend.patch
+4
-18
Misc/NEWS
Misc/NEWS
+1
-1
No files found.
Mac/BuildScript/build-installer.py
View file @
35c41e8e
...
...
@@ -237,9 +237,9 @@ def library_recipes():
result
.
extend
([
dict
(
name
=
"OpenSSL 1.0.2
e
"
,
url
=
"https://www.openssl.org/source/openssl-1.0.2
e
.tar.gz"
,
checksum
=
'
5262bfa25b60ed9de9f28d5d52d77fc5
'
,
name
=
"OpenSSL 1.0.2
f
"
,
url
=
"https://www.openssl.org/source/openssl-1.0.2
f
.tar.gz"
,
checksum
=
'
b3bf73f507172be9292ea2a8c28b659d
'
,
patches
=
[
"openssl_sdk_makedepend.patch"
,
],
...
...
Mac/BuildScript/openssl_sdk_makedepend.patch
View file @
35c41e8e
#
HG changeset patch
#
Parent
ff8a7557607cffd626997e57ed31c1012a3018aa
#
Parent
d377390f787c0739a3e89f669def72d7167e5108
#
openssl_sdk_makedepend.patch
#
# using openssl 1.0.2
e
# using openssl 1.0.2
f
#
# - support building with an OS X SDK
#
- allow "make depend" to use compilers with names other than "gcc"
diff Configure
diff --git a/Configure b/Configure
--- a/Configure
+++ b/Configure
@@ -63
5,12 +635
,12 @@
@@ -63
8,12 +638
,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}::",
...
...
@@ -31,7 +30,7 @@ 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",
@@ -171
4,8 +1714
,7 @@
@@ -171
7,8 +1717
,7 @@
s/^CC=.*$/CC= $cc/;
s/^AR=\s*ar/AR= $ar/;
s/^RANLIB=.*/RANLIB= $ranlib/;
...
...
@@ -41,16 +40,3 @@ diff --git a/Configure b/Configure
}
s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
diff --git a/util/domd b/util/domd
--- a/util/domd
+++ b/util/domd
@@ -14,8 +14,7 @@
cp Makefile Makefile.save
# fake the presence of Kerberos
touch $TOP/krb5.h
-if ${MAKEDEPEND} --version 2>&1 | grep -q "clang" ||
- echo $MAKEDEPEND | grep -q "gcc"; then
+if true ; then
args=""
while [ $# -gt 0 ]; do
if [ "$1" != "--" ]; then args="$args $1"; fi
Misc/NEWS
View file @
35c41e8e
...
...
@@ -243,7 +243,7 @@ Build
-
Issue
#
25696
:
Fix
installation
of
Python
on
UNIX
with
make
-
j9
.
-
Issue
#
2
5798
:
Update
OS
X
10.5
installer
to
use
OpenSSL
1.0.2
e
.
-
Issue
#
2
6268
:
Update
OS
X
10.5
installer
to
use
OpenSSL
1.0.2f
.
Windows
-------
...
...
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