diff options
Diffstat (limited to 'lang/spidermonkey/files/patch-config')
| -rw-r--r-- | lang/spidermonkey/files/patch-config | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/lang/spidermonkey/files/patch-config b/lang/spidermonkey/files/patch-config index a1f5484eeba6..1e57f4702eac 100644 --- a/lang/spidermonkey/files/patch-config +++ b/lang/spidermonkey/files/patch-config @@ -1,47 +1,16 @@ ---- 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/Linux_All.mk 2005-05-10 21:53:44.000000000 +0200 ++++ config/Linux_All.mk 2008-06-18 14:26:06.000000000 +0200 +@@ -41,8 +41,8 @@ # 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? + CFLAGS += -Wall -Wno-format OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R - RANLIB = echo @@ -74,7 +74,7 @@ GFX_ARCH = x @@ -72,12 +41,3 @@ +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 - |