# HG changeset patch # User Antoine Bodin # Date 1298260107 -3600 # Node ID 9a659d5bccb07c0206232619c52948c5ea3154bb # Parent 9caf4331f9341512f19093e8f4399fe7598aee58# Parent 73f88b3f05a779ba17a06c42ec505ccae0642c9f Automated merge with https://bitbucket.org/gokhlayeh/wok diff -r 9caf4331f934 -r 9a659d5bccb0 spidermonkey/stuff/spidermonkey-1.7-threadsafe.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/spidermonkey/stuff/spidermonkey-1.7-threadsafe.patch Mon Feb 21 04:48:27 2011 +0100 @@ -0,0 +1,16 @@ +--- js/src/Makefile.ref.orig 2008-05-28 19:51:32.000000000 -0400 ++++ js/src/Makefile.ref 2008-05-28 19:52:17.000000000 -0400 +@@ -63,11 +63,11 @@ + + ifdef JS_THREADSAFE + DEFINES += -DJS_THREADSAFE +-INCLUDES += -I$(DIST)/include/nspr ++INCLUDES += -I/usr/include/nspr + ifdef USE_MSVC + OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib + else +-OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX) ++OTHER_LIBS += -L/usr/$(LIBDIR)/nspr -lnspr${NSPR_LIBSUFFIX} + endif + endif + diff -r 9caf4331f934 -r 9a659d5bccb0 spidermonkey/stuff/spidermonkey-Makefile.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/spidermonkey/stuff/spidermonkey-Makefile.patch Mon Feb 21 04:48:27 2011 +0100 @@ -0,0 +1,110 @@ + + + +svntogit/community.git - Git clone of the 'community' subversion repository + + + + + + + + + +
+ +
+ +
+
+
+ + + +
+summaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/spidermonkey/trunk/spidermonkey-Makefile.patch
blob: abf1f31640e5e22c104cc5852c598ab7fac23a77 (plain) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+
*** Makefile.ref.orig	2009-02-16 09:56:29.000000000 -0600
+--- Makefile.ref	2009-02-16 09:58:59.000000000 -0600
+***************
+*** 169,184 ****
+--- 169,185 ----
+  	jstypes.h	\
+  	jsprvtd.h	\
+  	jspubtd.h	\
+  	jsregexp.h	\
+  	jsscan.h	\
+  	jsscope.h	\
+  	jsscript.h	\
+  	jsstr.h		\
++ 	jsutil.h        \
+  	jsxdrapi.h	\
+  	jsxml.h		\
+  	$(NULL)
+  
+  API_HFILES =		\
+  	jsapi.h		\
+  	jsdbgapi.h	\
+  	$(NULL)
+
+
+
+
+

Copyright © 2002-2010 Judd Vinet and Aaron Griffin. The Arch Linux name and logo +are recognized trademarks. Some rights reserved. The registered trademark +Linux© is used pursuant to a sublicense from LMI, the exclusive licensee +of Linus Torvalds, owner of the mark on a world-wide basis.

+
+ + +