diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-09-24 18:50:12 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-09-24 18:50:12 +0000 |
| commit | bb2fa7f032d0af15ec6055253b4bdfa07ae5f685 (patch) | |
| tree | 12ac5b505e9a803a5abab0cf901dcf2168467dcb | |
| parent | [bump] dev-perl/XML-LibXML-1.880.0 (diff) | |
| download | gentoo-2-bb2fa7f032d0af15ec6055253b4bdfa07ae5f685.tar.gz gentoo-2-bb2fa7f032d0af15ec6055253b4bdfa07ae5f685.tar.bz2 gentoo-2-bb2fa7f032d0af15ec6055253b4bdfa07ae5f685.zip | |
Avoid brute force install_name_tooling by hacking the makefiles
(Portage version: 2.2.01.19295-prefix/cvs/Darwin i386)
| -rw-r--r-- | dev-libs/nss/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.12.11.ebuild | 20 |
2 files changed, 10 insertions, 15 deletions
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index c974e45b3a8b..f862089fb83c 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/nss # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.217 2011/09/24 15:43:47 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.218 2011/09/24 18:50:12 grobian Exp $ + + 24 Sep 2011; Fabian Groffen <grobian@gentoo.org> nss-3.12.11.ebuild: + Avoid brute force install_name_tooling by hacking the makefiles 24 Sep 2011; Fabian Groffen <grobian@gentoo.org> nss-3.12.11.ebuild: Fixup library ids and references, not to use @executable_path on Darwin diff --git a/dev-libs/nss/nss-3.12.11.ebuild b/dev-libs/nss/nss-3.12.11.ebuild index 2ea5e9892453..029f1bc24bfb 100644 --- a/dev-libs/nss/nss-3.12.11.ebuild +++ b/dev-libs/nss/nss-3.12.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.11.ebuild,v 1.4 2011/09/24 15:43:47 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.11.ebuild,v 1.5 2011/09/24 18:50:12 grobian Exp $ EAPI=3 inherit eutils flag-o-matic multilib toolchain-funcs @@ -50,6 +50,11 @@ src_prepare() { "${S}"/mozilla/security/nss/config/nss.pc.in || die fi + # Avoid install_name_tooling post install + sed -i -e "s:@executable_path:${EPREFIX}/usr/$(get_libdir):" \ + "${S}"/mozilla/security/coreconf/Darwin.mk \ + "${S}"/mozilla/security/nss/lib/freebl/config.mk || die + epatch "${FILESDIR}"/${PN}-3.12.4-solaris-gcc.patch # breaks non-gnu tools # dirty hack cd "${S}"/mozilla/security/nss @@ -157,19 +162,6 @@ src_install () { n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) mv ${file} ${n} ln -s ${n} ${file} - if [[ ${CHOST} == *-darwin* ]]; then - # fix install_name - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" ${n} || die - # and the references that were already made against it - install_name_tool \ - -change "@executable_path/libnssutil3.dylib" \ - "${EPREFIX}/usr/$(get_libdir)/libnssutil3.dylib" \ - ${n} || die - install_name_tool \ - -change "@executable_path/libnss3.dylib" \ - "${EPREFIX}/usr/$(get_libdir)/libnss3.dylib" \ - ${n} || die - fi done local nssutils |