summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Boshell <leonardop@gentoo.org>2005-07-05 20:48:03 +0000
committerLeonardo Boshell <leonardop@gentoo.org>2005-07-05 20:48:03 +0000
commit779a381d6845b38b50b54664bd133ad41180800f (patch)
tree1c6d9d60ad7f4cc4c3ba6d2c4955a33d83f4e974 /dev-util/pkgconfig
parentMarked ~ia64. (diff)
downloadgentoo-2-779a381d6845b38b50b54664bd133ad41180800f.tar.gz
gentoo-2-779a381d6845b38b50b54664bd133ad41180800f.tar.bz2
gentoo-2-779a381d6845b38b50b54664bd133ad41180800f.zip
Adding patch to fix search path
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-util/pkgconfig')
-rw-r--r--dev-util/pkgconfig/ChangeLog7
-rw-r--r--dev-util/pkgconfig/files/pkg-config-0.18.1-pc_path.patch12
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.18.1.ebuild15
3 files changed, 30 insertions, 4 deletions
diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index a6c2fed7db9c..63faabb5daf2 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/pkgconfig
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.29 2005/07/05 18:58:58 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.30 2005/07/05 20:48:03 leonardop Exp $
+
+ 05 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> pkgconfig-0.18.1.ebuild,
+ files/pkg-config-0.18.1-pc_path.patch:
+ Added patch from https://bugs.freedesktop.org/show_bug.cgi?id=3662 to set
+ the default search path correctly.
*pkgconfig-0.18.1 (05 Jul 2005)
diff --git a/dev-util/pkgconfig/files/pkg-config-0.18.1-pc_path.patch b/dev-util/pkgconfig/files/pkg-config-0.18.1-pc_path.patch
new file mode 100644
index 000000000000..f584af8529f2
--- /dev/null
+++ b/dev-util/pkgconfig/files/pkg-config-0.18.1-pc_path.patch
@@ -0,0 +1,12 @@
+diff -NurdB pkg-config-0.18.1/configure.in pkg-config-0.18.1-patched/configure.in
+--- pkg-config-0.18.1/configure.in 2005-06-29 06:07:14.000000000 -0500
++++ pkg-config-0.18.1-patched/configure.in 2005-07-05 14:57:01.000000000 -0500
+@@ -16,7 +16,7 @@
+ [ pc_path="$withval"
+ AC_MSG_CHECKING([for default search path for .pc files])
+ AC_MSG_RESULT([$pc_path])],
+- [pc_path="$libdir/$PACKAGE:$datadir/$PACKAGE"])
++ [pc_path="$libdir/pkgconfig:$datadir/pkgconfig"])
+ AC_SUBST([pc_path])
+ dnl AC_DEFINE_UNQUOTED(PKG_CONFIG_PC_PATH,["$pc_path"],[Default search path for .pc files])
+
diff --git a/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild
index 844f668c4237..cb62c252e7fc 100644
--- a/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild,v 1.1 2005/07/05 18:58:58 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild,v 1.2 2005/07/05 20:48:03 leonardop Exp $
-inherit flag-o-matic gnome.org
+inherit eutils flag-o-matic gnome.org
MY_PN="pkg-config"
+MY_P=${MY_PN}-${PV}
DESCRIPTION="Package config system that manages compile/link flags for libraries"
HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
@@ -15,11 +16,19 @@ IUSE="hardened"
DEPEND=""
-S=${WORKDIR}/${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
src_unpack() {
unpack ${A}
+ cd ${S}
+
use ppc64 && use hardened && replace-flags -O[2-3] -O1
+
+ # Set the default search path correctly
+ epatch ${FILESDIR}/${MY_P}-pc_path.patch
+
+ einfo "Running autoconf"
+ autoconf || die "Autoconf failed"
}
src_compile() {