summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2011-11-24 21:45:37 +0000
committerIan Stakenvicius <axs@gentoo.org>2011-11-24 21:45:37 +0000
commitb21ecd6a6da87f164eee81458b44d6e5cd40e143 (patch)
tree5600654c8a2655455382776fbea512ac05fc78a2 /dev-lang
parentUse Firefox 8.x headers to build. (diff)
downloadhistorical-b21ecd6a6da87f164eee81458b44d6e5cd40e143.tar.gz
historical-b21ecd6a6da87f164eee81458b44d6e5cd40e143.tar.bz2
historical-b21ecd6a6da87f164eee81458b44d6e5cd40e143.zip
modified ldflags patch to fix ldflags on bin/js, bug 391665
Package-Manager: portage-2.1.10.11/cvs/Linux i686
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/spidermonkey/ChangeLog6
-rw-r--r--dev-lang/spidermonkey/Manifest10
-rw-r--r--dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch13
3 files changed, 21 insertions, 8 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/Manifest b/dev-lang/spidermonkey/Manifest
index 79a839c19d89..912cd83d428b 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -3,7 +3,7 @@ Hash: SHA256
AUX spidermonkey-1.5-build.patch 3457 RMD160 323b186d6be267bce42f15fe0694b8c17d1e927d SHA1 995708c8cbd03ed690505fab70a54349d4b94d09 SHA256 04a2b3b1b85825f463c6eb703d32e66747e2a8cca81b0026b958862eb1248fdb
AUX spidermonkey-1.6-header.patch 270 RMD160 ff656884925470695542b2b9412a130c72577f3a SHA1 6039b01f565b2bf2c20490a52b99b52796057b61 SHA256 e81acd7ba025214b2ecfa5918a1652e4590eaca39307c4e8d9f5d949d315373e
-AUX spidermonkey-1.7.0-ldflags.patch 893 RMD160 c3009458820d8a756e9bba48d505e3b5fb475d94 SHA1 5d5c766cbff361ba55ce551ec303deff752dba94 SHA256 bb90cd97a5ebdfa8ebbd44ee64d651683e49df1df9ae9e3a05913adb7d46d0c8
+AUX spidermonkey-1.7.0-ldflags.patch 1076 RMD160 419d4b375bc1d9a75c6594e46879b241321a54db SHA1 023315e5ad7f977f9b5e3920a9c39c4c3e0b1209 SHA256 7dcc26496a6413652ff32ce1b1eb04c7ef526658d41a243f1ce0e44598cd809b
AUX spidermonkey-1.7.0-threadsafe.diff 513 RMD160 894fd8791cdf3156031e4cb370a0de40ce53cdf2 SHA1 cd4d61468ca2fdd1f90b6bb207ebf46427261166 SHA256 3e41354e093efce3fe897814bc490aa45e17c9d6d0ca6ae7f9f1550b85be89e9
AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 RMD160 0a6e799e6b47c0011ba02c877e0d190ae3830c62 SHA1 b0f776c06e956024fb0f0553f8056bbce0830273 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd823
AUX spidermonkey-1.8.5-fix-ppc64.patch 849 RMD160 def597b1b913385b908da7e09683c23bc5e6e61d SHA1 4700b680441e65854e9fb3108218ea9f0f8d264d SHA256 5cfdb6a590e02c83cd15732e417da9fdd26bd65490fe07e21c173d375e3c6abc
@@ -16,12 +16,12 @@ EBUILD spidermonkey-1.7.0-r2.ebuild 1664 RMD160 2eea40d279729740380fd8eca22d1425
EBUILD spidermonkey-1.7.0.ebuild 1432 RMD160 9dc3f12649f67fe727f8b327a54bbc91c0522358 SHA1 411aad11f1d1beb4435aa19a43d96447b11e7dac SHA256 5df2e8917fce96363d2128a2fdafc623aa159e60682591b347201b062778a99e
EBUILD spidermonkey-1.8.2.15.ebuild 1909 RMD160 f023579d5da8abea011f0310ca6d2bc3130d8bcc SHA1 ee017ef05bfc908bbc65ebaebbbbde556e66457b SHA256 fa7ad212b4606e8b2087de34f2d30bfa10cbbcc90a905a43b32b285df3ccc290
EBUILD spidermonkey-1.8.5-r1.ebuild 2243 RMD160 1e24c6f320bb07b9ec192f14db3bb4bf06e08753 SHA1 98f90b0d0495c2c639b1d5ceca1eef79d49bb1bd SHA256 8f44beb32a44b2cae432b64b4af7490930245deeab775e8a811fc927538115a9
-MISC ChangeLog 10357 RMD160 de988068b79a257d91e2e347667ed1e59e49a656 SHA1 d733b0118a5abf686d7a693521c9a57a95f7ba53 SHA256 e4dd7a2fb221c045d02d032d98ddd79cd254e58ff1103e7a685ccb6578b0fe48
+MISC ChangeLog 10511 RMD160 5dd711d82aacf8f23bf3a4fa1d36a4beb59afb3f SHA1 16fdf7b36fb508173274fe4865ce9182475e4545 SHA256 b0fa3d9e0b7c39d75709a62d9b83d150cb241afb0bf0ca30b9e87dccdc2917f7
MISC metadata.xml 523 RMD160 b40a1ffd94bc32fd5045b99160481c2b95d69d30 SHA1 91eb56541e242621c81e38eb9e9f0c4dea6f099f SHA256 876e7996ea990b78088ea8ef1f0445658fea0bb7cf0a1e07cd1db2bae870307f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk7Kq4EACgkQAJxUfCtlWe1FqwD/YToCj9xy9hRXZbEwS4hyfrqe
-ccsiKxXo5Ud9oTz4RxIBAIAJxDxrLi02VV3ibFu9t+3mTFJfQquEN12+QV1RdCiU
-=wMI9
+iF4EAREIAAYFAk7OuvUACgkQAJxUfCtlWe2fqwEA2XKH4Wn4q6EQ9kB+I08Azsdz
+v7aLsO7i6vxJTtBdzhEBAKCYL9embpcL9P14lrHzh2oATM+uDsTUScie5opSZsY7
+=RpK3
-----END PGP SIGNATURE-----
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