<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[143276] trunk/dports/devel/openssl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/143276">143276</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-12-09 12:50:02 -0800 (Wed, 09 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>openssl: Fix FTBFS on 10.7, closes #47035
Upstream is at https://github.com/openssl/openssl/issues/494</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelopensslPortfile">trunk/dports/devel/openssl/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelopensslfilesfixAppleclangversiondetectionpatch">trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelopensslPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/openssl/Portfile (143275 => 143276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/Portfile 2015-12-09 20:30:44 UTC (rev 143275)
+++ trunk/dports/devel/openssl/Portfile 2015-12-09 20:50:02 UTC (rev 143276)
</span><span class="lines">@@ -40,7 +40,8 @@
</span><span class="cx"> patchfiles install-headers-HFS+.patch \
</span><span class="cx"> parallel-building.patch \
</span><span class="cx"> remove-duplicate-bn_print-doc.patch \
</span><del>- x86_64-asm-on-i386.patch
</del><ins>+ x86_64-asm-on-i386.patch \
+ fix-Apple-clang-version-detection.patch
</ins><span class="cx">
</span><span class="cx"> configure.ccache no
</span><span class="cx"> configure.perl /usr/bin/perl
</span></span></pre></div>
<a id="trunkdportsdevelopensslfilesfixAppleclangversiondetectionpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch (0 => 143276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch (rev 0)
+++ trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch 2015-12-09 20:50:02 UTC (rev 143276)
</span><span class="lines">@@ -0,0 +1,234 @@
</span><ins>+Fix OpenSSL compiler version gates for older Apple clang versions
+
+OpenSSL modified the detection code for AVX and the addx instruction to support
+clang from Xcode 7. The new regexes now match and extract the "Apple" version
+numbering scheme, which is then interpreted as LLVM version number and yields
+incorrect results.
+
+Fix this by introducing separate checks for Apple's compiler versions. This is
+necessary because Apple has now dropped the "based on LLVM" string in newer
+compiler versions. Of course the best alternative would be to switch to tests
+that actually check whether the feature is present, rather than looking at the
+compiler versions, though.
+
+Signed-off-by: Clemens Lang <cal@macports.org>
+Upstream-Status: Submitted [https://github.com/openssl/openssl/issues/494]
+--- ./crypto/aes/asm/aesni-mb-x86_64.pl.orig 2015-12-03 14:42:07.000000000 +0100
++++ ./crypto/aes/asm/aesni-mb-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -63,7 +63,14 @@
+ $avx = ($1>=10) + ($1>=11);
+ }
+
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([2-9]\.[0-9]+)/) {
++ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
++ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
++ # see http://trac.macports.org/wiki/XcodeVersionInfo
++ $avx = ($2>=2.1) + ($2>=3.1);
++}
++
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+ $avx = ($2>=3.0) + ($2>3.0);
+ }
+
+--- ./crypto/aes/asm/aesni-sha1-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
++++ ./crypto/aes/asm/aesni-sha1-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -94,7 +94,9 @@
+ $avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
+ `ml64 2>&1` =~ /Version ([0-9]+)\./ &&
+ $1>=10);
+-$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);
++# Apple clang 2.1 and 3.0 correspond to LLVM 3.0, see http://trac.macports.org/wiki/XcodeVersionInfo
++$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/ && $2>=2.1);
++$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);
+
+ $shaext=1; ### set to zero if compiling for 1.0.1
+
+--- ./crypto/aes/asm/aesni-sha256-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
++++ ./crypto/aes/asm/aesni-sha256-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -59,7 +59,14 @@
+ $avx = ($1>=10) + ($1>=12);
+ }
+
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([2-9]\.[0-9]+)/) {
++ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
++ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
++ # see http://trac.macports.org/wiki/XcodeVersionInfo
++ $avx = ($2>=2.1) + ($2>=3.1);
++}
++
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+ $avx = ($2>=3.0) + ($2>3.0);
+ }
+
+--- ./crypto/bn/asm/rsaz-x86_64.pl.orig 2015-12-03 14:42:07.000000000 +0100
++++ ./crypto/bn/asm/rsaz-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -113,7 +113,12 @@
+ $addx = ($1>=12);
+ }
+
+-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([5-9])\.([0-9]+)/) {
++ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
++ $addx = ($ver>=5.00); # Apple LLVM version 5.0 corresponds to LLVM 3.3, see http://trac.macports.org/wiki/XcodeVersionInfo
++}
++
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {
+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
+ $addx = ($ver>=3.03);
+ }
+--- ./crypto/bn/asm/x86_64-mont.pl.orig 2015-12-03 14:42:07.000000000 +0100
++++ ./crypto/bn/asm/x86_64-mont.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -68,7 +68,12 @@
+ $addx = ($1>=12);
+ }
+
+-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([5-9])\.([0-9]+)/) {
++ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
++ $addx = ($ver>=5.00); # Apple LLVM version 5.0 corresponds to LLVM 3.3, see http://trac.macports.org/wiki/XcodeVersionInfo
++}
++
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {
+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
+ $addx = ($ver>=3.03);
+ }
+--- ./crypto/bn/asm/x86_64-mont5.pl.orig 2015-12-03 15:41:12.000000000 +0100
++++ ./crypto/bn/asm/x86_64-mont5.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -53,7 +53,12 @@
+ $addx = ($1>=12);
+ }
+
+-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([5-9])\.([0-9]+)/) {
++ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
++ $addx = ($ver>=5.00); # Apple LLVM version 5.0 corresponds to LLVM 3.3, see http://trac.macports.org/wiki/XcodeVersionInfo
++}
++
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {
+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
+ $addx = ($ver>=3.03);
+ }
+--- ./crypto/ec/asm/ecp_nistz256-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
++++ ./crypto/ec/asm/ecp_nistz256-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -81,7 +81,16 @@
+ $addx = ($1>=12);
+ }
+
+-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([2-9])\.([0-9]+)/) {
++ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
++ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
++ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
++ $avx = ($ver>=2.01) + ($ver>=3.01);
++ # Apple LLVM version 5.0 corresponds to LLVM 3.3
++ $addx = ($ver>=5.00);
++}
++
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {
+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
+ $avx = ($ver>=3.0) + ($ver>=3.01);
+ $addx = ($ver>=3.03);
+--- ./crypto/modes/asm/aesni-gcm-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
++++ ./crypto/modes/asm/aesni-gcm-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -56,7 +56,13 @@
+ $avx = ($1>=10) + ($1>=11);
+ }
+
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
++ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
++ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
++ $avx = ($2>=2.1) + ($2>=3.1);
++}
++
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+ $avx = ($2>=3.0) + ($2>3.0);
+ }
+
+--- ./crypto/modes/asm/ghash-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
++++ ./crypto/modes/asm/ghash-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -105,7 +105,13 @@
+ $avx = ($1>=10) + ($1>=11);
+ }
+
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
++ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
++ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
++ $avx = ($2>=2.1) + ($2>=3.1);
++}
++
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+ $avx = ($2>=3.0) + ($2>3.0);
+ }
+
+--- ./crypto/sha/asm/sha1-mb-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
++++ ./crypto/sha/asm/sha1-mb-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -58,7 +58,13 @@
+ $avx = ($1>=10) + ($1>=11);
+ }
+
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
++ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
++ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
++ $avx = ($2>=2.1) + ($2>=3.1);
++}
++
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+ $avx = ($2>=3.0) + ($2>3.0);
+ }
+
+--- ./crypto/sha/asm/sha1-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
++++ ./crypto/sha/asm/sha1-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -107,7 +107,13 @@
+ $avx = ($1>=10) + ($1>=11);
+ }
+
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([2-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
++ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
++ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
++ $avx = ($2>=2.1) + ($2>=3.1);
++}
++
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+ $avx = ($2>=3.0) + ($2>3.0);
+ }
+
+--- ./crypto/sha/asm/sha256-mb-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
++++ ./crypto/sha/asm/sha256-mb-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -59,7 +59,13 @@
+ $avx = ($1>=10) + ($1>=11);
+ }
+
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
++ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
++ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
++ $avx = ($2>=2.1) + ($2>=3.1);
++}
++
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+ $avx = ($2>=3.0) + ($2>3.0);
+ }
+
+--- ./crypto/sha/asm/sha512-x86_64.pl.orig 2015-12-03 15:04:23.000000000 +0100
++++ ./crypto/sha/asm/sha512-x86_64.pl 2015-12-09 01:31:37.000000000 +0100
+@@ -124,7 +124,13 @@
+ $avx = ($1>=10) + ($1>=11);
+ }
+
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
++ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
++ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
++ $avx = ($2>=2.1) + ($2>=3.1);
++}
++
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+ $avx = ($2>=3.0) + ($2>3.0);
+ }
+
</ins></span></pre>
</div>
</div>
</body>
</html>