<!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>[135937] trunk/dports/lang/mozjs17</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/135937">135937</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-05-07 04:37:39 -0700 (Thu, 07 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mozjs17: fix build on Leopard (#45832)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangmozjs17Portfile">trunk/dports/lang/mozjs17/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangmozjs17filespatchjssrcconfigurediff">trunk/dports/lang/mozjs17/files/patch-js-src-configure.diff</a></li>
<li><a href="#trunkdportslangmozjs17filespatchjssrcjsinterpcppdiff">trunk/dports/lang/mozjs17/files/patch-js-src-jsinterp.cpp.diff</a></li>
<li><a href="#trunkdportslangmozjs17filespatchmfbtdoubleconversionutilshdiff">trunk/dports/lang/mozjs17/files/patch-mfbt-double-conversion-utils.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangmozjs17filesfixgotoscopejsinterpcppdiff">trunk/dports/lang/mozjs17/files/fix-goto-scope-jsinterp.cpp.diff</a></li>
<li><a href="#trunkdportslangmozjs17filespatchconfigurenodeploymenttargetdiff">trunk/dports/lang/mozjs17/files/patch-configure-no-deployment-target.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangmozjs17Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/mozjs17/Portfile (135936 => 135937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/mozjs17/Portfile 2015-05-07 10:12:47 UTC (rev 135936)
+++ trunk/dports/lang/mozjs17/Portfile 2015-05-07 11:37:39 UTC (rev 135937)
</span><span class="lines">@@ -31,11 +31,14 @@
</span><span class="cx"> port:libffi
</span><span class="cx">
</span><span class="cx"> distname mozjs${version}
</span><del>-worksrcdir ${distname}/js/src
</del><span class="cx">
</span><ins>+autoconf.dir ${worksrcpath}/js/src
+configure.dir ${autoconf.dir}
+build.dir ${configure.dir}
+
</ins><span class="cx"> use_autoconf yes
</span><span class="cx"> autoconf.cmd autoconf213
</span><del>-compiler.blacklist *gcc-*
</del><ins>+compiler.blacklist *llvm-gcc-*
</ins><span class="cx"> configure.args --with-system-nspr \
</span><span class="cx"> --enable-system-ffi \
</span><span class="cx"> --disable-readline \
</span><span class="lines">@@ -43,8 +46,9 @@
</span><span class="cx">
</span><span class="cx"> configure.ccache no
</span><span class="cx">
</span><del>-patchfiles fix-goto-scope-jsinterp.cpp.diff \
- patch-configure-no-deployment-target.diff
</del><ins>+patchfiles patch-js-src-configure.diff \
+ patch-js-src-jsinterp.cpp.diff \
+ patch-mfbt-double-conversion-utils.h.diff
</ins><span class="cx">
</span><span class="cx"> variant readline description {Link js shell to system readline library} {
</span><span class="cx"> depends_lib-append port:readline
</span><span class="lines">@@ -62,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> # Use absolute path for install_name
</span><span class="cx"> post-patch {
</span><del>- reinplace "s|@executable_path|${prefix}/lib|g" ${worksrcpath}/config/rules.mk
</del><ins>+ reinplace "s|@executable_path|${prefix}/lib|g" ${configure.dir}/config/rules.mk
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[variant_isset universal]} {
</span></span></pre></div>
<a id="trunkdportslangmozjs17filesfixgotoscopejsinterpcppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/mozjs17/files/fix-goto-scope-jsinterp.cpp.diff (135936 => 135937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/mozjs17/files/fix-goto-scope-jsinterp.cpp.diff 2015-05-07 10:12:47 UTC (rev 135936)
+++ trunk/dports/lang/mozjs17/files/fix-goto-scope-jsinterp.cpp.diff 2015-05-07 11:37:39 UTC (rev 135937)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- jsinterp.cpp.orig 2013-10-29 19:59:43.000000000 +0100
-+++ jsinterp.cpp 2013-10-29 20:01:44.000000000 +0100
-@@ -3664,7 +3664,9 @@
- BEGIN_CASE(JSOP_LEAVEFORLETIN)
- BEGIN_CASE(JSOP_LEAVEBLOCKEXPR)
- {
-+#ifdef DEBUG
- DebugOnly<uint32_t> blockDepth = regs.fp()->blockChain().stackDepth();
-+#endif
-
- regs.fp()->popBlock(cx);
-
</del></span></pre></div>
<a id="trunkdportslangmozjs17filespatchconfigurenodeploymenttargetdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/mozjs17/files/patch-configure-no-deployment-target.diff (135936 => 135937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/mozjs17/files/patch-configure-no-deployment-target.diff 2015-05-07 10:12:47 UTC (rev 135936)
+++ trunk/dports/lang/mozjs17/files/patch-configure-no-deployment-target.diff 2015-05-07 11:37:39 UTC (rev 135937)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- configure.orig 2013-11-23 22:44:08.000000000 +0100
-+++ configure 2013-11-23 22:44:23.000000000 +0100
-@@ -4478,8 +4478,6 @@
- *-darwin*)
- if test -n "$_MACOSX_DEPLOYMENT_TARGET" ; then
- export MACOSX_DEPLOYMENT_TARGET=$_MACOSX_DEPLOYMENT_TARGET
-- else
-- export MACOSX_DEPLOYMENT_TARGET=10.6
- fi
- ;;
- esac
</del></span></pre></div>
<a id="trunkdportslangmozjs17filespatchjssrcconfiguredifffromrev135936trunkdportslangmozjs17filespatchconfigurenodeploymenttargetdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/mozjs17/files/patch-js-src-configure.diff (from rev 135936, trunk/dports/lang/mozjs17/files/patch-configure-no-deployment-target.diff) (0 => 135937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/mozjs17/files/patch-js-src-configure.diff (rev 0)
+++ trunk/dports/lang/mozjs17/files/patch-js-src-configure.diff 2015-05-07 11:37:39 UTC (rev 135937)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- js/src/configure.orig 2013-11-23 22:44:08.000000000 +0100
++++ js/src/configure 2013-11-23 22:44:23.000000000 +0100
+@@ -4478,8 +4478,6 @@
+ *-darwin*)
+ if test -n "$_MACOSX_DEPLOYMENT_TARGET" ; then
+ export MACOSX_DEPLOYMENT_TARGET=$_MACOSX_DEPLOYMENT_TARGET
+- else
+- export MACOSX_DEPLOYMENT_TARGET=10.6
+ fi
+ ;;
+ esac
</ins></span></pre></div>
<a id="trunkdportslangmozjs17filespatchjssrcjsinterpcppdifffromrev135936trunkdportslangmozjs17filesfixgotoscopejsinterpcppdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/mozjs17/files/patch-js-src-jsinterp.cpp.diff (from rev 135936, trunk/dports/lang/mozjs17/files/fix-goto-scope-jsinterp.cpp.diff) (0 => 135937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/mozjs17/files/patch-js-src-jsinterp.cpp.diff (rev 0)
+++ trunk/dports/lang/mozjs17/files/patch-js-src-jsinterp.cpp.diff 2015-05-07 11:37:39 UTC (rev 135937)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- js/src/jsinterp.cpp.orig 2013-10-29 19:59:43.000000000 +0100
++++ js/src/jsinterp.cpp 2013-10-29 20:01:44.000000000 +0100
+@@ -3664,7 +3664,9 @@
+ BEGIN_CASE(JSOP_LEAVEFORLETIN)
+ BEGIN_CASE(JSOP_LEAVEBLOCKEXPR)
+ {
++#ifdef DEBUG
+ DebugOnly<uint32_t> blockDepth = regs.fp()->blockChain().stackDepth();
++#endif
+
+ regs.fp()->popBlock(cx);
+
</ins></span></pre></div>
<a id="trunkdportslangmozjs17filespatchmfbtdoubleconversionutilshdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/mozjs17/files/patch-mfbt-double-conversion-utils.h.diff (0 => 135937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/mozjs17/files/patch-mfbt-double-conversion-utils.h.diff (rev 0)
+++ trunk/dports/lang/mozjs17/files/patch-mfbt-double-conversion-utils.h.diff 2015-05-07 11:37:39 UTC (rev 135937)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- mfbt/double-conversion/utils.h.orig 2013-02-11 23:33:28.000000000 +0100
++++ mfbt/double-conversion/utils.h 2014-11-29 13:32:40.000000000 +0100
+@@ -55,7 +55,7 @@
+ #if defined(_M_X64) || defined(__x86_64__) || \
+ defined(__ARMEL__) || defined(__avr32__) || \
+ defined(__hppa__) || defined(__ia64__) || \
+- defined(__mips__) || defined(__powerpc__) || \
++ defined(__mips__) || defined(__powerpc__) || defined(__POWERPC__) || \
+ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
+ defined(__SH4__) || defined(__alpha__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
</ins></span></pre>
</div>
</div>
</body>
</html>