<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/50f9be3d934010c36d5495625c08a2eaf37385b6">https://github.com/macports/macports-ports/commit/50f9be3d934010c36d5495625c08a2eaf37385b6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 50f9be3 mozjs52: fix universal build
</span>50f9be3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 50f9be3d934010c36d5495625c08a2eaf37385b6
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Dec 24 08:42:17 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> mozjs52: fix universal build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Modifying worksrcdir causes the muniversal PG to change directory
</span><span style='display:block; white-space:pre;color:#404040;'> structure.
</span><span style='display:block; white-space:pre;color:#404040;'> build/moz.configure/old.configure assumes original directory
</span><span style='display:block; white-space:pre;color:#404040;'> structure.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all.
</span>---
lang/mozjs52/Portfile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mozjs52/Portfile b/lang/mozjs52/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5012b40..d69691a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mozjs52/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mozjs52/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,6 @@ homepage https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Sp
</span> master_sites http://ftp.gnome.org/pub/GNOME/teams/releng/tarballs-needing-help/mozjs/
distname mozjs-${version}gnome1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${distname}/js/src
</span>
checksums rmd160 65e4ffaedab76dc5a74020e0156d35536e5acb5a \
sha256 31697943b1dbbb51ba9aee35b8269a353c487d7af4d336010b90054dc4f9b0af
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +40,7 @@ compiler.blacklist *gcc* {clang < 602} macports-clang-3.3 macports-clang-3.4 ma
</span>
# Use absolute path for install_name
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@executable_path|${prefix}/lib|g" ${worksrcpath}/../../config/rules.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@executable_path|${prefix}/lib|g" ${worksrcpath}/config/rules.mk
</span> }
configure.perl /usr/bin/perl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +49,7 @@ configure.python ${prefix}/bin/python2.7
</span> configure.env-append \
SHELL=/bin/bash
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir ${worksrcpath}/obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.dir ${worksrcpath}/js/src/obj
</span> configure.cmd ../configure
configure.args --with-system-icu \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,8 +58,8 @@ configure.args --with-system-icu \
</span> --enable-threadsafe
build.env-append SHELL=/bin/bash
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${worksrcpath}/obj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.dir ${worksrcpath}/obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir ${worksrcpath}/js/src/obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.dir ${worksrcpath}/js/src/obj
</span>
variant readline description {Link js shell to system readline library} {
depends_lib-append port:readline
</pre><pre style='margin:0'>
</pre>