diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2011-11-24 21:45:37 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2011-11-24 21:45:37 +0000 |
| commit | e87a33f399dedc261584806b3049e6d01113e450 (patch) | |
| tree | bb8609d5106b116bb77faf1344b25c8bc7a5dd16 | |
| parent | Use Firefox 8.x headers to build. (diff) | |
| download | gentoo-2-e87a33f399dedc261584806b3049e6d01113e450.tar.gz gentoo-2-e87a33f399dedc261584806b3049e6d01113e450.tar.bz2 gentoo-2-e87a33f399dedc261584806b3049e6d01113e450.zip | |
modified ldflags patch to fix ldflags on bin/js, bug 391665
(Portage version: 2.1.10.11/cvs/Linux i686)
| -rw-r--r-- | dev-lang/spidermonkey/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog index 290531d0ac9f..c631c1882ca5 100644 --- a/dev-lang/spidermonkey/ChangeLog +++ b/dev-lang/spidermonkey/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/spidermonkey # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.65 2011/11/21 19:50:31 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.66 2011/11/24 21:45:37 axs Exp $ + + 24 Nov 2011; Ian Stakenvicius <axs@gentoo.org> + files/spidermonkey-1.7.0-ldflags.patch: + modified ldflags patch to fix ldflags on bin/js, bug 391665 21 Nov 2011; Ian Stakenvicius <axs@gentoo.org> files/spidermonkey-1.7.0-ldflags.patch: diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch index bb36299a5f3f..4ddc3461ea11 100644 --- a/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch +++ b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch @@ -4,12 +4,21 @@ http://bugs.gentoo.org/show_bug.cgi?id=331129 --- js/src/Makefile.ref +++ js/src/Makefile.ref +@@ -87,7 +87,7 @@ + LDFLAGS = $(XLDFLAGS) + + ifndef NO_LIBM +-LDFLAGS += -lm ++OTHER_LIBS += -lm + endif + + # Prevent floating point errors caused by VC++ optimizations @@ -325,7 +325,7 @@ $(CC) -o $@ -c $(CFLAGS) $< $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX): $(OBJDIR)/jskwgen.$(OBJ_SUFFIX) - $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ -+ $(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $^ ++ $(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(OTHER_LIBS) $^ endif @@ -18,7 +27,7 @@ http://bugs.gentoo.org/show_bug.cgi?id=331129 else $(PROGRAM): $(PROG_OBJS) $(LIBRARY) - $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \ -+ $(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \ ++ $(CC) $(HOST_LDFLAGS) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(OTHER_LIBS) \ $(PROG_LIBS) endif |