ohnobinki_overlay Changeset - 078328bea2dd

Changeset - 078328bea2dd

Parent rev.

Child rev.

[Not reviewed]

default

0 2 1

Nathan Brink (binki) - 15 years ago 2011-01-10 22:14:15
ohnobinki@ohnopublishing.net

dev-lang/spidermonkey: Fix bug 325849 , fixing compilation on hardened and portage-multilib by replacing a call to $(LD) with a call to $(CC) and ensuring that CFLAGS and LDFLAGS are both respected.

(Portage version: 2.2.0_alpha11-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

3 files changed with 37 insertions and 15 deletions:

dev-lang/spidermonkey/Manifest

dev-lang/spidermonkey/files/spidermonkey-1.7.0-no-ld.patch

dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild

0 comments (0 inline, 0 general)

dev-lang/spidermonkey/Manifest

➞

Show inline comments

 -----BEGIN PGP SIGNED MESSAGE-----
 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 679 RMD160 8526ab33d971a4e6d836ace41d522e63c378d6f3 SHA1 929953bca09960d6f2762749f0cc969a5e58b6ba SHA256 bbea50178ad2569f9fbbf449f1727851cb51a67766568847cc2c208c45d43f29
 AUX spidermonkey-1.7.0-no-ld.patch 764 RMD160 876d33586b3706bdfa5c31f3f771aa71e933a5f2 SHA1 882312cde214cc06ee19c706ca012ebb2067bd78 SHA256 61fcd6c0d1938a1e7ac92a99750d69c6ddd7670b12219b00b5540ce9bc153cb4
 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-r2.ebuild 1675 RMD160 75845ebfbee8619ae5c68ae8e205ac53fccf9b0c SHA1 fcea2ee5b9b84470b2f7814ddb6bcab92b8bd953 SHA256 90322c330a144e4cb919c1046ea9deec26d148bfa233d129ddef7aab75c64216
+EBUILD spidermonkey-1.7.0-r2.ebuild 1710 RMD160 f65425ec31f4579318fda49e7ce4dafd948990f5 SHA1 9b0456fc5e48d2dfe63ec76997cafe77d6f27dbc SHA256 08c1916d588916b68d6655c2f64fb3dc1e88999160b22a3d207a78a86d74b6ec
 MISC metadata.xml 523 RMD160 b40a1ffd94bc32fd5045b99160481c2b95d69d30 SHA1 91eb56541e242621c81e38eb9e9f0c4dea6f099f SHA256 876e7996ea990b78088ea8ef1f0445658fea0bb7cf0a1e07cd1db2bae870307f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 iQIcBAEBCAAGBQJNK8QDAAoJEHQ6UuhrqBBQNWQQAKajQTpQY9TgXxQcafZKv4jA
 Xq48b3fODBJB7zfbrRSgV26I4EtZFc+HI0FE//tgA21ifx3VDvw2O86vp1PVbsbJ
 ISHljTSuRlP+YloKXfKeNQUnO4c1mTrK9J7/ZkNaO/YFoacwbIHrJQnMWQK3wefC
 D0lH6do9F3Wtk7MGfejtdK/Eo3eZrj+rC1ncOvHYgqA6GmzUQM+8jKptFQQ9xxml
 F7sZihiXMILAyJoqxVjPfNBapWp+N+Xhthzxn60crbDUKqsWDjyae+MoSefH67Ow
 cjxkeuvkO9sG9ahDmzDTK7edUf9k40zAJYPxhZOW596qpHVdqMWqDbmU/Y1VmaE2
 KujdHCXr+d+NSSCb86T2y0z4iWgTQMbsTX5AmQaglj3+TTg+Otz+i6Kkef7n+hv
 L/xBl8ZC7aV0yOO/SDuK78Zq+JRSRC4cxPBusWGi2eZkgzhvdJaJ1fsSJrf7uNge
 mIrzOngnQxHJ9scAkYP4NUMq0Z1zBkeeMSbpa8i29/X8GAPt4IczWF4eTlyrewb
 hQSKnZ3G2ocxTpvLoQA7/Y4YjTfhMRAkap6qr2pbmMObYTuwAdy2Qm1tJIkg4mjE
 Mty7wku4OOBq2vdVBn+0M9Ic1exxBylfk4gBJ+EXkccK8Xy9ozHB+LJZxi/gPCXq
 wTDuAHPKt6hR8t+WAnSr
 =ASZ8
 iQIcBAEBCAAGBQJNK8sGAAoJEHQ6UuhrqBBQ63IP/2E8f5RZQapqJvs7/x2ROacX
 BRC/INMmv8cz1TuqiLLYQMxY44Q5Sjw4Hn0mLWY0j8bzyK7SimY2a0T8zS8IS3JL
 ALzXDl4TZeGN6syrT1xFkQeG6fPlyvDLbq/vy1fZwtpjZDQfskmlqKf/xMALBaOi
 UUW85U/5E6cyJ5S7K3A4t/LIyqx7Arybi4HyjralWURaI1zSqKa/NNbSxmlCuVcZ
 pjvu+HOy6B/txluZwCUJfjLuXenNMa8xFg8sGaqbpqFvpAbP0EYxZsB+NjtUYLS
 dm3nmGjDeCa1NLHmND8GqPvjrGADuQocGSackuuSlYHo/g7lwZNn/k+C5E6i3zAf
 IB5qk0a1rixSOmb++UOhNH0YR3KedR3nB6ZgvQ1wf8iLKAZssWKV9ZXTMF659VXJ
 jrwzWs8a9Qgm4iEyvuCm0sKS8qsW4JhFQ4PKecQeWE2oC0Pl7IUnokyos7J4HB6
 Pz2Jjgb5KPAGWcDblzajUWpClrX9r/e6Kr2JnEiUDpv87jnkOXLu813Ua7loe1Md
 h0F7STkpwqDaId5ET7d/NycynGx6hmrctSaTpZ7IqbHfDwWangjRFX3m692W5h60
 S0JmJ/gIZO+5fmFANkzWN/sWs8e1WSdhh0QKA8U2NIzoWHZ+uxotezho8jSTropg
 m4jEH15t71/OfpagGCN
 =3CLs
 -----END PGP SIGNATURE-----

dev-lang/spidermonkey/files/spidermonkey-1.7.0-no-ld.patch

➞

Show inline comments

@@ new file 100644 @@
 Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
 Purpose: Call $(CC) instead of $(LD) so that $(CFLAGS) can be
 	included, fixing compilation for portage-multilib users. Also,
 	add missing $(LDFLAGS), fixing a QA violation.
 --- a/js/src/config/Linux_All.mk	Mon Jan 10 21:30:32 2011
 +++ a/js/src/config/Linux_All.mk	Mon Jan 10 21:41:35 2011
@@ -44,8 +44,9 @@
  CFLAGS +=  -Wall -Wno-format
  OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
 +CCLD = $(CC)
  RANLIB = echo
 -MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) -soname $(notdir $@)
 +MKSHLIB = $(CCLD) $(CFLAGS) $(HOST_LDFLAGS) -shared $(XMKSHLIBOPTS) -Wl,-soname,'$(notdir $@)'
  #.c.o:
  #      $(CC) -c -MD $*.d $(CFLAGS) $<
 Diff finished.  Mon Jan 10 21:41:36 2011

dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild

➞

Show inline comments

 # 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
 		"${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-no-ld.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
+}

0 comments (0 inline, 0 general)