Fix pkg-config and nspr-config for Darwin where the linker doesn't understand (and...

Package-Manager: portage-2.2.01.19295-prefix/cvs/Darwin i386

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 3ed438c1c017852fae2b556f1861c361899eada7..0cea3941b91f2e3d5dd109f6014c68b049b4a9e2 100644 (file)
--- 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 <grobian@gentoo.org> 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 <maekke@gentoo.org> 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 611c08acfe1fc06659d5906f252b54173c790b94..d612e24c38af085b40c1ef416c81dc8d86c19568 100644 (file)
--- 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() {