summaryrefslogtreecommitdiff
path: root/lang/spidermonkey/patches/patch-ae
diff options
context:
space:
mode:
authorfhajny <fhajny>2010-12-23 12:36:01 +0000
committerfhajny <fhajny>2010-12-23 12:36:01 +0000
commitc44297ff68621cc89113946218f6e09e3e9b3ecc (patch)
treeb2de72071e93ac6b5746e4be04ab03a71a9da610 /lang/spidermonkey/patches/patch-ae
parent30679f52065ff3e92d9ea3f475e8b20dce56db1a (diff)
downloadpkgsrc-c44297ff68621cc89113946218f6e09e3e9b3ecc.tar.gz
Updated lang/spidermonkey to 1.8.0 rc1 (see below).
No standard changelog provided from upstream, some bits scattered here: * http://www.mozilla.org/js/spidermonkey/release-notes/JS_170.html * https://developer.mozilla.org/En/SpiderMonkey/1.8 pkgsrc changes: * Threading support (and dependency on devel/nspr) is now optional (enabled by default). Threaded Spidermonkey may not be desirable for e.g. server-side JavaScript usage. * Unicode strings support optional. * Rudimental OpenSolaris/Solaris 11 config file provided. Release Candidate note: Spidermonkey 1.8.0 RC1 was the last version ever released as a standalone distribution, and is generally being used by the JavaScript community nowaways, if needed. In the future, ripping Spidermonkey out of the Mozilla tarball may be attempted too, to update the package to 1.9.x.
Diffstat (limited to 'lang/spidermonkey/patches/patch-ae')
-rw-r--r--lang/spidermonkey/patches/patch-ae43
1 files changed, 10 insertions, 33 deletions
diff --git a/lang/spidermonkey/patches/patch-ae b/lang/spidermonkey/patches/patch-ae
index 9394c2d76f0..002da54ad77 100644
--- a/lang/spidermonkey/patches/patch-ae
+++ b/lang/spidermonkey/patches/patch-ae
@@ -1,47 +1,24 @@
-$NetBSD: patch-ae,v 1.3 2010/01/16 15:04:32 tnn Exp $
+$NetBSD: patch-ae,v 1.4 2010/12/23 12:36:02 fhajny Exp $
---- Makefile.ref.orig 2006-08-21 18:58:45.000000000 +0000
+--- Makefile.ref.orig 2009-02-25 13:24:29.000000000 +0000
+++ Makefile.ref
-@@ -55,8 +55,6 @@ include config.mk
-
- ifdef USE_MSVC
- OTHER_LIBS += fdlibm/$(OBJDIR)/fdlibm.lib
--else
--OTHER_LIBS += -Lfdlibm/$(OBJDIR) -lfdm
- endif
-
- ifdef JS_THREADSAFE
-@@ -80,7 +78,8 @@ endif
- #
+@@ -83,7 +83,7 @@ endif
# XCFLAGS may be set in the environment or on the gmake command line
#
+ #CFLAGS += -DDEBUG -DDEBUG_brendan -DJS_ARENAMETER -DJS_HASHMETER -DJS_DUMP_PROPTREE_STATS -DJS_DUMP_SCOPE_METERS -DJS_SCOPE_DEPTH_METER -DJS_BASIC_STATS
-CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-+CFLAGS += -L$(PREFIX)/lib $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) \
-+ $(INCLUDES) $(XCFLAGS) `pkg-config --cflags nspr`
++CFLAGS += -L$(PREFIX)/lib $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
+ INTERP_CFLAGS += $(INTERP_OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(INTERP_XCFLAGS)
LDFLAGS = $(XLDFLAGS)
-
-@@ -248,12 +247,9 @@ JS_CFILES = \
- prmjtime.c \
- $(NULL)
-
--PREDIRS += fdlibm
-
- ifdef USE_MSVC
- FDLIBM_LIBRARY = fdlibm/$(OBJDIR)/fdlibm.lib
--else
--FDLIBM_LIBRARY = fdlibm/$(OBJDIR)/libfdm.a
- endif
- JSMATH_PRELINK = $(OBJDIR)/jsmathtemp.o
- # Flag for incremental linking
-@@ -307,9 +303,9 @@ ifdef USE_MSVC
- $(PROGRAM): $(PROG_OBJS) $(LIBRARY) $(FDLIBM_LIBRARY)
+@@ -318,9 +318,9 @@ ifdef USE_MSVC
+ $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
else
--$(PROGRAM): $(PROG_OBJS) $(LIBRARY) $(FDLIBM_LIBRARY)
+-$(PROGRAM): $(PROG_OBJS) $(LIBRARY)
- $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
- $(PROG_LIBS)
-+$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY) $(FDLIBM_LIBRARY)
++$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY)
+ $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L$(OBJDIR) $(LDFLAGS) \
+ $(OTHER_LIBS) $(PROG_LIBS) -ljs -lm
endif