Apply patch from Kacper Kowalik <xarthisius@gentoo.org> to respect LDFLAGS. Bug #331129

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 87 insertions, 12 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index 1e5a1fcd6446..e9343494738d 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.46 2010/03/07 22:38:56 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.47 2010/08/06 23:15:48 hwoarang Exp $
+
+*spidermonkey-1.7.0-r2 (06 Aug 2010)
+
+  06 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  +spidermonkey-1.7.0-r2.ebuild, +files/spidermonkey-1.7.0-ldflags.patch:
+  Apply patch from Kacper Kowalik <xarthisius@gentoo.org> to respect
+  LDFLAGS. Bug #331129
 
 *spidermonkey-1.7.0-r1 (07 Mar 2010)
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 17a43abe395f..f4a798ebcf32 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 679 RMD160 8526ab33d971a4e6d836ace41d522e63c378d6f3 SHA1 929953bca09960d6f2762749f0cc969a5e58b6ba SHA256 bbea50178ad2569f9fbbf449f1727851cb51a67766568847cc2c208c45d43f29
 AUX spidermonkey-1.7.0-threadsafe.diff 513 RMD160 894fd8791cdf3156031e4cb370a0de40ce53cdf2 SHA1 cd4d61468ca2fdd1f90b6bb207ebf46427261166 SHA256 3e41354e093efce3fe897814bc490aa45e17c9d6d0ca6ae7f9f1550b85be89e9
 DIST js-1.7.0.tar.gz 1165607 RMD160 6eadf1ac7c10a13b3db3d499856c9e18ddbcdfdb SHA1 1a99e8e10cb6600a03ea98895583a8ed42136d1f SHA256 44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b
 EBUILD spidermonkey-1.7.0-r1.ebuild 1528 RMD160 83a93b0c5da41ce58b95f19cd8d5f6849352a64a SHA1 69b9b0fa22309a9a58c80fd5be65019d59252179 SHA256 535396b4d5aad6b578413f90d5e96ba17caf4a4c8db7341a77c7c6db8ea8be7b
+EBUILD spidermonkey-1.7.0-r2.ebuild 1675 RMD160 75845ebfbee8619ae5c68ae8e205ac53fccf9b0c SHA1 fcea2ee5b9b84470b2f7814ddb6bcab92b8bd953 SHA256 90322c330a144e4cb919c1046ea9deec26d148bfa233d129ddef7aab75c64216
 EBUILD spidermonkey-1.7.0.ebuild 1441 RMD160 ffa9984090cece4cc58a3cddeb991b091d1347a8 SHA1 6f448cdc372065681428ca352160d6f78ac5c8d4 SHA256 d6d8711c775927675bc1df7aebaf84d4eedb20b57b11c5e1f6bcf6f01f786661
-MISC ChangeLog 6715 RMD160 56f4c21c993f7cad24e5ec294852c6c047fe071b SHA1 7a645874ac76506015b24d39ecd0f937d8225803 SHA256 d18ec74784c7a947b473aa86dec398683f1be34dd1dfe33bff1bb3e80b509c09
+MISC ChangeLog 6973 RMD160 ce6e2b3cabb912e359be3e2b6003989c66fb702d SHA1 56692399e56cc7398b7f9ebb3971c041963a31a5 SHA256 33d6b812c736b681e15f1da97c0258a77356ee126517df959c34e30ec5cf473c
 MISC metadata.xml 433 RMD160 a8aa33c0f430f8f80a47adaab4415bc8d0df057b SHA1 29c765414b22f2fa56ed0eb4f780ee3ec16da6a5 SHA256 39727d30931062610a21875826740d8661ab5afffcb94746ed961baac437f083
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iD8DBQFLlCqEQW+hXSf0t0IRAtzYAJ43JOEY8kEXWt0hZ2xYLxQlk8xWxgCfWMzh
-2l8dNJmX3y/+9dNpQfcOEtA=
-=k/we
------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
new file mode 100644
index 000000000000..2aad9404f4d4
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.7.0-ldflags.patch
@@ -0,0 +1,24 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=331129
+
+--- js/src/Makefile.ref
++++ js/src/Makefile.ref
+@@ -338,7 +338,7 @@
+ 	link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
+ 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) \
+ 	    $(PROG_LIBS)
+ endif
+ 
+@@ -355,7 +355,7 @@
+ 	$(OBJDIR)/jscpucfg > $@
+ 
+ $(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o
+-	$(CC) -o $@ $(OBJDIR)/jscpucfg.o
++	$(CC) $(HOST_LDFLAGS) -o $@ $(OBJDIR)/jscpucfg.o
+ 
+ # Add to TARGETS for clobber rule
+ TARGETS += $(OBJDIR)/jsautocfg.h $(OBJDIR)/jscpucfg \
diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild
new file mode 100644
index 000000000000..94d68f5742cd
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild,v 1.1 2010/08/06 23:15:48 hwoarang Exp $
+
+inherit eutils toolchain-funcs multilib flag-o-matic
+
+MY_P="js-${PV}"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
+
+LICENSE="NPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="threadsafe unicode"
+
+S="${WORKDIR}/js/src"
+
+RDEPEND="threadsafe? ( dev-libs/nspr )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.5-build.patch"
+	epatch "${FILESDIR}/${PN}-1.6-header.patch"
+	epatch "${FILESDIR}/${P}-threadsafe.diff" \
+		"${FILESDIR}"/${P}-ldflags.patch
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# Don't try to be smart, this does not work in cross-compile anyway
+		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
+	fi
+}
+
+src_compile() {
+	use unicode && append-flags "-DJS_C_STRINGS_ARE_UTF8"
+	tc-export CC LD AR
+	if use threadsafe; then
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
+			XLDFLAGS="$(raw-ldflags)" HOST_LDFLAGS="${LDFLAGS}" \
+				|| die "emake with threadsafe enabled failed";
+	else
+		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" XLDFLAGS="$(raw-ldflags)" \
+		HOST_LDFLAGS="${LDFLAGS}" || die "emake without threadsafe enabled failed";
+	fi
+}
+
+src_install() {
+	emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || die
+	dodoc ../jsd/README
+	dohtml README.html
+}