From 6a52dc60423c9368147734ef9cc77cdfcd9c14a1 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 24 Sep 2011 15:08:21 +0000 Subject: [PATCH] Fix pkg-config and nspr-config for Darwin where the linker doesn't understand (and need) -R arguments, bug #364753 Package-Manager: portage-2.2.01.19295-prefix/cvs/Darwin i386 --- dev-libs/nspr/ChangeLog | 6 +++++- dev-libs/nspr/nspr-4.8.9.ebuild | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 3ed438c1c017..0cea3941b91f 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.167 2011/09/04 10:13:30 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.168 2011/09/24 15:08:21 grobian Exp $ + + 24 Sep 2011; Fabian Groffen nspr-4.8.9.ebuild: + Fix pkg-config and nspr-config for Darwin where the linker doesn't understand + (and need) -R arguments, bug #364753 04 Sep 2011; Markus Meier nspr-4.8.8.ebuild: arm stable, bug #379549 diff --git a/dev-libs/nspr/nspr-4.8.9.ebuild b/dev-libs/nspr/nspr-4.8.9.ebuild index 611c08acfe1f..d612e24c38af 100644 --- a/dev-libs/nspr/nspr-4.8.9.ebuild +++ b/dev-libs/nspr/nspr-4.8.9.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/nspr/nspr-4.8.9.ebuild,v 1.1 2011/08/27 23:40:25 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.9.ebuild,v 1.2 2011/09/24 15:08:21 grobian Exp $ EAPI=3 @@ -36,6 +36,13 @@ src_prepare() { # Respect LDFLAGS sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ mozilla/nsprpub/config/rules.mk + + if [[ ${CHOST} == *-darwin* ]] ; then + # Fix pkgconfig for Darwin (no RPATH stuff) + sed -i -e 's/-Wl,-R${\?libdir}\?//' \ + "${S}"/mozilla/nsprpub/config/nspr-config.in \ + "${S}"/mozilla/nsprpub/config/nspr.pc.in || die + fi } src_configure() { -- 2.26.2