Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kwabena Antwi-Boasiako
slapos
Commits
9096b748
Commit
9096b748
authored
May 19, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mac: Trigger x64 compilation if we have Darwin64
parent
e7e50c5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
0 deletions
+28
-0
component/openssl/buildout.cfg
component/openssl/buildout.cfg
+9
-0
component/openssl/openssl-mac-x64.patch
component/openssl/openssl-mac-x64.patch
+19
-0
No files found.
component/openssl/buildout.cfg
View file @
9096b748
...
...
@@ -26,6 +26,14 @@ url = ${:_profile_base_location_}/${:filename}
filename = ${:_buildout_section_name_}
download-only = true
[openssl-mac-x64.patch]
# Force x64 compilation if platform is Darwin
recipe = hexagonit.recipe.download
md5sum = eb6146cda3100f0d686713a7769890ac
url = ${:_profile_base_location_}/${:filename}
filename = ${:_buildout_section_name_}
download-only = true
[openssl]
recipe = hexagonit.recipe.cmmi
url = https://www.openssl.org/source/openssl-1.0.1c.tar.gz
...
...
@@ -33,6 +41,7 @@ md5sum = ae412727c8c15b67880aef7bd2999b2e
patches =
${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}
${openssl-exlibs.patch:location}/${openssl-exlibs.patch:filename}
${openssl-mac-x64.patch:location}/${openssl-mac-x64.patch:filename}
patch-options = -p0
configure-command = ./config
configure-options =
...
...
component/openssl/openssl-mac-x64.patch
0 → 100644
View file @
9096b748
--- config 2012-05-19 18:03:04.000000000 +0200
+++ config2 2012-05-19 18:03:37.000000000 +0200
@@ -553,15 +553,7 @@
fi ;;
i?86-apple-darwin*)
ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
- if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
- echo "WARNING! If you wish to build 64-bit library, then you have to"
- echo " invoke './Configure darwin64-x86_64-cc' *manually*."
- if [ "$TEST" = "false" -a -t 1 ]; then
- echo " You have about 5 seconds to press Ctrl-C to abort."
- (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
- fi
- fi
- if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
+ if [ "$ISA64" = "1" ]; then
OUT="darwin64-x86_64-cc"
else
OUT="darwin-i386-cc"
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