summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2011-09-24 16:57:47 +0000
committerFabian Groffen <grobian@gentoo.org>2011-09-24 16:57:47 +0000
commitc58c6973d15f02820fe795a74a049e5332a76fe4 (patch)
treede93e0616e10f393d3d07e34182b0b787ea5d887 /dev-lang
parentalpha/ia64/sparc stable wrt #376395 (diff)
downloadgentoo-2-c58c6973d15f02820fe795a74a049e5332a76fe4.tar.gz
gentoo-2-c58c6973d15f02820fe795a74a049e5332a76fe4.tar.bz2
gentoo-2-c58c6973d15f02820fe795a74a049e5332a76fe4.zip
Fix install_name for produced shared library on Darwin, keyworded ~x86-macos and ~x64-macos bug #354523
(Portage version: 2.2.01.19295-prefix/cvs/Darwin i386)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/spidermonkey/ChangeLog12
-rw-r--r--dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild12
2 files changed, 20 insertions, 4 deletions
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index 8828341376d2..a9bd8e3b4998 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,16 @@
# 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.61 2011/07/03 05:28:44 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.62 2011/09/24 16:57:47 grobian Exp $
+
+ 24 Sep 2011; Fabian Groffen <grobian@gentoo.org>
+ spidermonkey-1.8.2.15.ebuild:
+ Fix install_name for produced shared library on Darwin, keyworded ~x86-macos
+ and ~x64-macos bug #354523
+
+ 24 Sep 2011; Fabian Groffen <grobian@gentoo.org>
+ spidermonkey-1.8.2.15.ebuild:
+ Fix install_name for produced shared library on Darwin, keyworded ~x86-macos
+ and ~x64-macos bug #354523
*spidermonkey-1.8.5 (03 Jul 2011)
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild
index cb3414cc058d..56eaee302203 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild,v 1.1 2011/06/22 02:22:54 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.2.15.ebuild,v 1.2 2011/09/24 16:57:47 grobian Exp $
-EAPI="2"
+EAPI="3"
inherit eutils toolchain-funcs multilib python
MY_PV="${PV}"
@@ -14,7 +14,7 @@ SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2"
LICENSE="NPL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x86-macos"
IUSE="threadsafe"
S="${WORKDIR}/mozilla-1.9.2"
@@ -69,4 +69,10 @@ src_install() {
emake install DESTDIR="${D}" || die
dodoc ../jsd/README
dohtml README.html
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # fixup install_name
+ install_name_tool -id "${EPREFIX}"/usr/$(get_libdir)/libmozjs.dylib \
+ "${ED}"/usr/$(get_libdir)/libmozjs.dylib || die
+ fi
}