kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/lang/spidermonkey/files/patch-config

84 lines
2 KiB
Text
Raw Normal View History

Unbreak for all platforms (tested on amd64 and i386) -- use -fPIC on sparc64 and -fpic elsewhere. While here, make the following improvements: . ignore the vendor's fdlibm and use our own -lm. fdlibm is derived from the same msun as ours, but spidermonkey was misteriously linking with _both_. All mozilla-ports seem to have the same problem right now; . use our -lreadline instead of compiling vendor's own libeditline; . fix all warnings (clean build with -Wall -Werror); . link the installed executable (js) against the shared library libjs.so instead of against the invididual objects; . unless WITHOUT_TEST is set, download and run vendor's own tests in post-build (this triggers USE_PERL_BUILD). Some tests had to be patched from Mozilla's CVS, because the released tarball of them was not updated since 2002. Bump PORTREVISION. Approved by: portmgr (marcus) Approved by: maintainer timeout
2005-08-11 06:00:00 +02:00
--- 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
Spidermonkey version update to 1.5 with fixes for ia64/amd64 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>
2006-01-08 22:31:22 +01:00
--- 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
Unbreak for all platforms (tested on amd64 and i386) -- use -fPIC on sparc64 and -fpic elsewhere. While here, make the following improvements: . ignore the vendor's fdlibm and use our own -lm. fdlibm is derived from the same msun as ours, but spidermonkey was misteriously linking with _both_. All mozilla-ports seem to have the same problem right now; . use our -lreadline instead of compiling vendor's own libeditline; . fix all warnings (clean build with -Wall -Werror); . link the installed executable (js) against the shared library libjs.so instead of against the invididual objects; . unless WITHOUT_TEST is set, download and run vendor's own tests in post-build (this triggers USE_PERL_BUILD). Some tests had to be patched from Mozilla's CVS, because the released tarball of them was not updated since 2002. Bump PORTREVISION. Approved by: portmgr (marcus) Approved by: maintainer timeout
2005-08-11 06:00:00 +02:00
#
-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
Spidermonkey version update to 1.5 with fixes for ia64/amd64 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>
2006-01-08 22:31:22 +01:00
RANLIB = echo
@@ -74,7 +74,7 @@
Unbreak for all platforms (tested on amd64 and i386) -- use -fPIC on sparc64 and -fpic elsewhere. While here, make the following improvements: . ignore the vendor's fdlibm and use our own -lm. fdlibm is derived from the same msun as ours, but spidermonkey was misteriously linking with _both_. All mozilla-ports seem to have the same problem right now; . use our -lreadline instead of compiling vendor's own libeditline; . fix all warnings (clean build with -Wall -Werror); . link the installed executable (js) against the shared library libjs.so instead of against the invididual objects; . unless WITHOUT_TEST is set, download and run vendor's own tests in post-build (this triggers USE_PERL_BUILD). Some tests had to be patched from Mozilla's CVS, because the released tarball of them was not updated since 2002. Bump PORTREVISION. Approved by: portmgr (marcus) Approved by: maintainer timeout
2005-08-11 06:00:00 +02:00
GFX_ARCH = x
-OS_LIBS = -lm -lc
+OS_LIBS = -lm
ASFLAGS += -x assembler-with-cpp
Spidermonkey version update to 1.5 with fixes for ia64/amd64 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>
2006-01-08 22:31:22 +01:00
@@ -88,16 +88,12 @@
endif
Unbreak for all platforms (tested on amd64 and i386) -- use -fPIC on sparc64 and -fpic elsewhere. While here, make the following improvements: . ignore the vendor's fdlibm and use our own -lm. fdlibm is derived from the same msun as ours, but spidermonkey was misteriously linking with _both_. All mozilla-ports seem to have the same problem right now; . use our -lreadline instead of compiling vendor's own libeditline; . fix all warnings (clean build with -Wall -Werror); . link the installed executable (js) against the shared library libjs.so instead of against the invididual objects; . unless WITHOUT_TEST is set, download and run vendor's own tests in post-build (this triggers USE_PERL_BUILD). Some tests had to be patched from Mozilla's CVS, because the released tarball of them was not updated since 2002. Bump PORTREVISION. Approved by: portmgr (marcus) Approved by: maintainer timeout
2005-08-11 06:00:00 +02:00
# 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
Spidermonkey version update to 1.5 with fixes for ia64/amd64 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>
2006-01-08 22:31:22 +01:00
OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
Unbreak for all platforms (tested on amd64 and i386) -- use -fPIC on sparc64 and -fpic elsewhere. While here, make the following improvements: . ignore the vendor's fdlibm and use our own -lm. fdlibm is derived from the same msun as ours, but spidermonkey was misteriously linking with _both_. All mozilla-ports seem to have the same problem right now; . use our -lreadline instead of compiling vendor's own libeditline; . fix all warnings (clean build with -Wall -Werror); . link the installed executable (js) against the shared library libjs.so instead of against the invididual objects; . unless WITHOUT_TEST is set, download and run vendor's own tests in post-build (this triggers USE_PERL_BUILD). Some tests had to be patched from Mozilla's CVS, because the released tarball of them was not updated since 2002. Bump PORTREVISION. Approved by: portmgr (marcus) Approved by: maintainer timeout
2005-08-11 06:00:00 +02:00
-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
Reference in a new issue Copy permalink