diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-09-24 15:43:47 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-09-24 15:43:47 +0000 |
| commit | b9edc1993dad0b39cd6e3ccddac9665b074bbd49 (patch) | |
| tree | 567b41f82105b2ea6867d433ddb1a573c0005710 /dev-libs | |
| parent | Fix build with libpng-1.5, bug 383915 (diff) | |
| download | gentoo-2-b9edc1993dad0b39cd6e3ccddac9665b074bbd49.tar.gz gentoo-2-b9edc1993dad0b39cd6e3ccddac9665b074bbd49.tar.bz2 gentoo-2-b9edc1993dad0b39cd6e3ccddac9665b074bbd49.zip | |
Fixup library ids and references, not to use @executable_path on Darwin
(Portage version: 2.2.01.19295-prefix/cvs/Darwin i386)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/nss/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.12.11.ebuild | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index 6225fc0b6d26..c974e45b3a8b 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.216 2011/09/24 15:03:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.217 2011/09/24 15:43:47 grobian Exp $ + + 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 24 Sep 2011; Fabian Groffen <grobian@gentoo.org> nss-3.12.11.ebuild: Fix pkg-config and nss-config for Darwin where the linker doesn't understand diff --git a/dev-libs/nss/nss-3.12.11.ebuild b/dev-libs/nss/nss-3.12.11.ebuild index df1bb42503d7..2ea5e9892453 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.3 2011/09/24 15:03:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.11.ebuild,v 1.4 2011/09/24 15:43:47 grobian Exp $ EAPI=3 inherit eutils flag-o-matic multilib toolchain-funcs @@ -158,7 +158,17 @@ src_install () { mv ${file} ${n} ln -s ${n} ${file} if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die + # 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 |