<!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>[122863] trunk/dports/lang/ruby21</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/122863">122863</a></dd>
<dt>Author</dt> <dd>kimuraw@macports.org</dd>
<dt>Date</dt> <dd>2014-08-01 04:33:02 -0700 (Fri, 01 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>lang/ruby21: fix ext/fiddle not installed with libffi-3.1 (#44508)
- https://bugs.ruby-lang.org/issues/9897 ext/fiddle not installed with libffi-3.1
- https://bugs.ruby-lang.org/issues/9656 ext/dl not installed with apple clang-5.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangruby21Portfile">trunk/dports/lang/ruby21/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangruby21filespatchextdlextconfrbdiff">trunk/dports/lang/ruby21/files/patch-ext-dl-extconf.rb.diff</a></li>
<li><a href="#trunkdportslangruby21filespatchextfiddleextconfrbdiff">trunk/dports/lang/ruby21/files/patch-ext-fiddle-extconf.rb.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangruby21Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/ruby21/Portfile (122862 => 122863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/ruby21/Portfile 2014-08-01 04:44:40 UTC (rev 122862)
+++ trunk/dports/lang/ruby21/Portfile 2014-08-01 11:33:02 UTC (rev 122863)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name ruby21
</span><span class="cx"> version 2.1.2
</span><del>-revision 0
</del><ins>+revision 1
</ins><span class="cx">
</span><span class="cx"> categories lang ruby
</span><span class="cx"> maintainers kimuraw openmaintainer
</span><span class="lines">@@ -59,6 +59,11 @@
</span><span class="cx"> # Port "ruby" and "ruby19" does the same.
</span><span class="cx"> configure.env-append UNAME_RELEASE=${os.major}
</span><span class="cx">
</span><ins>+# patch-ext-fiddle-extconf.rb.diff: https://bugs.ruby-lang.org/issues/9897
+# patch-ext-dl-extconf.rb.diff: https://bugs.ruby-lang.org/issues/9656
+patchfiles patch-ext-dl-extconf.rb.diff \
+ patch-ext-fiddle-extconf.rb.diff
+
</ins><span class="cx"> # Add the architecture flag as required
</span><span class="cx"> if {[info exists build_arch] && ${build_arch} != ""} {
</span><span class="cx"> configure.args-append "--with-arch=${build_arch}"
</span></span></pre></div>
<a id="trunkdportslangruby21filespatchextdlextconfrbdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/ruby21/files/patch-ext-dl-extconf.rb.diff (0 => 122863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/ruby21/files/patch-ext-dl-extconf.rb.diff (rev 0)
+++ trunk/dports/lang/ruby21/files/patch-ext-dl-extconf.rb.diff 2014-08-01 11:33:02 UTC (rev 122863)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Index: ext/dl/extconf.rb
+===================================================================
+--- ext/dl/extconf.rb (revision 46302)
++++ ext/dl/extconf.rb (revision 46303)
+@@ -1,7 +1,12 @@
+ require 'mkmf'
+
+ if RbConfig::CONFIG['GCC'] == 'yes'
+- (have_macro("__clang__") ? $LDFLAGS : $CFLAGS) << " -fno-defer-pop"
++ flag = " -fno-defer-pop"
++ if have_macro("__clang__")
++ $LDFLAGS << flag if try_ldflags(flag)
++ else
++ $CFLAGS << flag
++ end
+ $CFLAGS << " -fno-omit-frame-pointer"
+ end
+
</ins></span></pre></div>
<a id="trunkdportslangruby21filespatchextfiddleextconfrbdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/ruby21/files/patch-ext-fiddle-extconf.rb.diff (0 => 122863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/ruby21/files/patch-ext-fiddle-extconf.rb.diff (rev 0)
+++ trunk/dports/lang/ruby21/files/patch-ext-fiddle-extconf.rb.diff 2014-08-01 11:33:02 UTC (rev 122863)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Index: ext/fiddle/extconf.rb
+===================================================================
+--- ext/fiddle/extconf.rb (revision 46608)
++++ ext/fiddle/extconf.rb (revision 47020)
+@@ -7,7 +7,8 @@
+ pkg_config("libffi")
+ if ver = pkg_config("libffi", "modversion")
+ ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored.
+- $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver.split('.') }})
++ ver = (ver.split('.') + [0,0])[0,3]
++ $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver }})
+ end
+
+ unless have_header('ffi.h')
</ins></span></pre>
</div>
</div>
</body>
</html>