[135937] trunk/dports/lang/mozjs17
ryandesign at macports.org
ryandesign at macports.org
Thu May 7 04:37:39 PDT 2015
Revision: 135937
https://trac.macports.org/changeset/135937
Author: ryandesign at macports.org
Date: 2015-05-07 04:37:39 -0700 (Thu, 07 May 2015)
Log Message:
-----------
mozjs17: fix build on Leopard (#45832)
Modified Paths:
--------------
trunk/dports/lang/mozjs17/Portfile
Added Paths:
-----------
trunk/dports/lang/mozjs17/files/patch-js-src-configure.diff
trunk/dports/lang/mozjs17/files/patch-js-src-jsinterp.cpp.diff
trunk/dports/lang/mozjs17/files/patch-mfbt-double-conversion-utils.h.diff
Removed Paths:
-------------
trunk/dports/lang/mozjs17/files/fix-goto-scope-jsinterp.cpp.diff
trunk/dports/lang/mozjs17/files/patch-configure-no-deployment-target.diff
Modified: trunk/dports/lang/mozjs17/Portfile
===================================================================
--- 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)
@@ -31,11 +31,14 @@
port:libffi
distname mozjs${version}
-worksrcdir ${distname}/js/src
+autoconf.dir ${worksrcpath}/js/src
+configure.dir ${autoconf.dir}
+build.dir ${configure.dir}
+
use_autoconf yes
autoconf.cmd autoconf213
-compiler.blacklist *gcc-*
+compiler.blacklist *llvm-gcc-*
configure.args --with-system-nspr \
--enable-system-ffi \
--disable-readline \
@@ -43,8 +46,9 @@
configure.ccache no
-patchfiles fix-goto-scope-jsinterp.cpp.diff \
- patch-configure-no-deployment-target.diff
+patchfiles patch-js-src-configure.diff \
+ patch-js-src-jsinterp.cpp.diff \
+ patch-mfbt-double-conversion-utils.h.diff
variant readline description {Link js shell to system readline library} {
depends_lib-append port:readline
@@ -62,7 +66,7 @@
# Use absolute path for install_name
post-patch {
- reinplace "s|@executable_path|${prefix}/lib|g" ${worksrcpath}/config/rules.mk
+ reinplace "s|@executable_path|${prefix}/lib|g" ${configure.dir}/config/rules.mk
}
if {[variant_isset universal]} {
Deleted: trunk/dports/lang/mozjs17/files/fix-goto-scope-jsinterp.cpp.diff
===================================================================
--- 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)
@@ -1,12 +0,0 @@
---- 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);
-
Deleted: trunk/dports/lang/mozjs17/files/patch-configure-no-deployment-target.diff
===================================================================
--- 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)
@@ -1,11 +0,0 @@
---- 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
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)
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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
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)
===================================================================
--- 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)
@@ -0,0 +1,12 @@
+--- 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);
+
Added: trunk/dports/lang/mozjs17/files/patch-mfbt-double-conversion-utils.h.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150507/538850fb/attachment-0001.html>
More information about the macports-changes
mailing list