Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 331129 | Differences between
and this patch

Collapse All | Expand All

(-)spidermonkey-1.7.0-r1.ebuild (-5 / +6 lines)
Lines 17-23 Link Here
17
S="${WORKDIR}/js/src"
17
S="${WORKDIR}/js/src"
18
18
19
RDEPEND="threadsafe? ( dev-libs/nspr )"
19
RDEPEND="threadsafe? ( dev-libs/nspr )"
20
21
DEPEND="${RDEPEND}"
20
DEPEND="${RDEPEND}"
22
21
23
src_unpack() {
22
src_unpack() {
Lines 25-31 Link Here
25
	cd "${S}"
24
	cd "${S}"
26
	epatch "${FILESDIR}/${PN}-1.5-build.patch"
25
	epatch "${FILESDIR}/${PN}-1.5-build.patch"
27
	epatch "${FILESDIR}/${PN}-1.6-header.patch"
26
	epatch "${FILESDIR}/${PN}-1.6-header.patch"
28
	epatch "${FILESDIR}/${P}-threadsafe.diff"
27
	epatch "${FILESDIR}/${P}-threadsafe.diff" \
28
		"${FILESDIR}"/${P}-ldflags.patch
29
	if [[ ${CHOST} == *-freebsd* ]]; then
29
	if [[ ${CHOST} == *-freebsd* ]]; then
30
		# Don't try to be smart, this does not work in cross-compile anyway
30
		# Don't try to be smart, this does not work in cross-compile anyway
31
		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
31
		ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
Lines 37-46 Link Here
37
	tc-export CC LD AR
37
	tc-export CC LD AR
38
	if use threadsafe; then
38
	if use threadsafe; then
39
		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
39
		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" JS_THREADSAFE=1 \
40
		|| die "emake with threadsafe enabled failed";
40
			XLDFLAGS="$(raw-ldflags)" HOST_LDFLAGS="${LDFLAGS}" \
41
				|| die "emake with threadsafe enabled failed";
41
	else
42
	else
42
		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" \
43
		emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" XLDFLAGS="$(raw-ldflags)" \
43
		|| die "emake without threadsafe enabled failed";
44
		HOST_LDFLAGS="${LDFLAGS}" || die "emake without threadsafe enabled failed";
44
	fi
45
	fi
45
}
46
}
46
47

Return to bug 331129