b9f6b0710b
Update source to spidermonkey 1.5 and patched (much thanks to Anish Mistry) to fix compilation problems under amd64 (and presumably ia64 too but untested) and to make the build thread-safe. PR: ports/91522 Submitted by: Dan Rench <citric@cubicone.tmetic.com>
83 lines
2 KiB
Text
83 lines
2 KiB
Text
--- Makefile.ref Fri Nov 14 19:10:55 2003
|
|
+++ Makefile.ref Sat Aug 6 12:25:36 2005
|
|
@@ -56,6 +56,4 @@
|
|
ifdef USE_MSVC
|
|
OTHER_LIBS += fdlibm/$(OBJDIR)/fdlibm.lib
|
|
-else
|
|
-OTHER_LIBS += -Lfdlibm/$(OBJDIR) -lfdm
|
|
endif
|
|
|
|
@@ -242,10 +240,6 @@
|
|
$(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
|
|
@@ -301,6 +295,6 @@
|
|
link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
|
|
else
|
|
-$(PROGRAM): $(PROG_OBJS) $(LIBRARY) $(FDLIBM_LIBRARY)
|
|
- $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
|
|
+$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY) $(FDLIBM_LIBRARY)
|
|
+ $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L$(OBJDIR) -ljs $(LDFLAGS) $(OTHER_LIBS) \
|
|
$(PROG_LIBS)
|
|
endif
|
|
--- config/Linux_All.mk.orig Tue May 10 15:53:44 2005
|
|
+++ config/Linux_All.mk Sat Dec 10 21:17:45 2005
|
|
@@ -41,9 +41,9 @@
|
|
# Config for all versions of Linux
|
|
#
|
|
|
|
-CC = gcc
|
|
-CCC = g++
|
|
-CFLAGS += -Wall -Wno-format
|
|
+CC ?= gcc
|
|
+CCC ?= g++
|
|
+CFLAGS += -Wall -Werror # XXX do these work with non-gcc and non-icc?
|
|
OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
|
|
|
|
RANLIB = echo
|
|
@@ -74,7 +74,7 @@
|
|
|
|
GFX_ARCH = x
|
|
|
|
-OS_LIBS = -lm -lc
|
|
+OS_LIBS = -lm
|
|
|
|
ASFLAGS += -x assembler-with-cpp
|
|
|
|
@@ -88,16 +88,12 @@
|
|
endif
|
|
|
|
# Use the editline library to provide line-editing support.
|
|
-JS_EDITLINE = 1
|
|
+JS_READLINE = 1
|
|
|
|
-ifeq ($(CPU_ARCH),x86_64)
|
|
-# Use VA_COPY() standard macro on x86-64
|
|
-# FIXME: better use it everywhere
|
|
OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
|
|
-endif
|
|
|
|
-ifeq ($(CPU_ARCH),x86_64)
|
|
-# We need PIC code for shared libraries
|
|
-# FIXME: better patch rules.mk & fdlibm/Makefile*
|
|
+ifeq ($(CPU_ARCH),sparc64)
|
|
OS_CFLAGS += -DPIC -fPIC
|
|
+else
|
|
+OS_CFLAGS += -DPIC -fpic
|
|
endif
|
|
--- rules.mk Fri Nov 14 19:11:04 2003
|
|
+++ rules.mk Mon Aug 8 14:40:36 2005
|
|
@@ -59,5 +59,5 @@
|
|
TARGETS += $(SHARED_LIBRARY) $(PROGRAM) # it is now
|
|
else
|
|
-TARGETS += $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM)
|
|
+TARGETS += $(SHARED_LIBRARY) $(PROGRAM)
|
|
endif
|
|
|