<!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>[153136] trunk/dports/security/libtomcrypt</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/153136">153136</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-09-25 06:39:05 -0700 (Sun, 25 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>security/libtomcrypt: fix build on OS X >= 10.10
Closes #52364.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssecuritylibtomcryptPortfile">trunk/dports/security/libtomcrypt/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/security/libtomcrypt/files/</li>
<li><a href="#trunkdportssecuritylibtomcryptfilespatchrolcasmdiff">trunk/dports/security/libtomcrypt/files/patch-rolc-asm.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssecuritylibtomcryptPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/libtomcrypt/Portfile (153135 => 153136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/libtomcrypt/Portfile 2016-09-25 13:08:32 UTC (rev 153135)
+++ trunk/dports/security/libtomcrypt/Portfile 2016-09-25 13:39:05 UTC (rev 153136)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx">
</span><span class="cx"> worksrcdir ${name}-${version}
</span><span class="cx">
</span><ins>+patchfiles patch-rolc-asm.diff
+
</ins><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="cx"> build.target
</span></span></pre></div>
<a id="trunkdportssecuritylibtomcryptfilespatchrolcasmdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/security/libtomcrypt/files/patch-rolc-asm.diff (0 => 153136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/libtomcrypt/files/patch-rolc-asm.diff (rev 0)
+++ trunk/dports/security/libtomcrypt/files/patch-rolc-asm.diff 2016-09-25 13:39:05 UTC (rev 153136)
</span><span class="lines">@@ -0,0 +1,83 @@
</span><ins>+Upstream: https://github.com/libtom/libtomcrypt/commit/62878de0c5dbb9f89474590d953bbdb339bd2f76
+
+Adapted to apply to 1.17.
+
+index c2832ab..f0dcf68 100644
+--- src/headers/tomcrypt_macros.h
++++ src/headers/tomcrypt_macros.h
+@@ -262,21 +262,22 @@
+
+ #ifndef LTC_NO_ROLC
+
+-static inline unsigned ROLc(unsigned word, const int i)
+-{
+- asm ("roll %2,%0"
+- :"=r" (word)
+- :"0" (word),"I" (i));
+- return word;
+-}
+-
+-static inline unsigned RORc(unsigned word, const int i)
+-{
+- asm ("rorl %2,%0"
+- :"=r" (word)
+- :"0" (word),"I" (i));
+- return word;
+-}
++#define ROLc(word,i) ({ \
++ ulong32 __ROLc_tmp = word; \
++ __asm__ ("roll %2, %0" : \
++ "=r" (__ROLc_tmp) : \
++ "0" (__ROLc_tmp), \
++ "I" (i)); \
++ __ROLc_tmp; \
++ })
++#define RORc(word,i) ({ \
++ ulong32 __RORc_tmp = word; \
++ __asm__ ("rorl %2, %0" : \
++ "=r" (__RORc_tmp) : \
++ "0" (__RORc_tmp), \
++ "I" (i)); \
++ __RORc_tmp; \
++ })
+
+ #else
+
+@@ -361,21 +362,22 @@
+
+ #ifndef LTC_NO_ROLC
+
+-static inline unsigned long ROL64c(unsigned long word, const int i)
+-{
+- asm("rolq %2,%0"
+- :"=r" (word)
+- :"0" (word),"J" (i));
+- return word;
+-}
+-
+-static inline unsigned long ROR64c(unsigned long word, const int i)
+-{
+- asm("rorq %2,%0"
+- :"=r" (word)
+- :"0" (word),"J" (i));
+- return word;
+-}
++#define ROL64c(word,i) ({ \
++ ulong64 __ROL64c_tmp = word; \
++ __asm__ ("rolq %2, %0" : \
++ "=r" (__ROL64c_tmp) : \
++ "0" (__ROL64c_tmp), \
++ "J" (i)); \
++ __ROL64c_tmp; \
++ })
++#define ROR64c(word,i) ({ \
++ ulong64 __ROR64c_tmp = word; \
++ __asm__ ("rorq %2, %0" : \
++ "=r" (__ROR64c_tmp) : \
++ "0" (__ROR64c_tmp), \
++ "J" (i)); \
++ __ROR64c_tmp; \
++ })
+
+ #else /* LTC_NO_ROLC */
+
</ins></span></pre>
</div>
</div>
</body>
</html>