diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2011-10-24 00:16:57 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2011-10-24 00:16:57 +0000 |
| commit | 785df40354418d5755870aa43c5d05af0621a3ad (patch) | |
| tree | 1a1528060366ed2078fa7cfc665e5da9e54c9ca8 /dev-util | |
| parent | app-text/notmuch: New package, version 0.9. (diff) | |
| download | gentoo-2-785df40354418d5755870aa43c5d05af0621a3ad.tar.gz gentoo-2-785df40354418d5755870aa43c5d05af0621a3ad.tar.bz2 gentoo-2-785df40354418d5755870aa43c5d05af0621a3ad.zip | |
Add prefix support; move prefix keywords from overlay
(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/pkgconfig/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/pkgconfig/pkgconfig-0.26.ebuild | 25 |
2 files changed, 24 insertions, 6 deletions
diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog index ebbc7f2f4000..0da78a74a427 100644 --- a/dev-util/pkgconfig/ChangeLog +++ b/dev-util/pkgconfig/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/pkgconfig # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.101 2011/10/13 20:00:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.102 2011/10/24 00:16:57 abcd Exp $ + + 24 Oct 2011; Jonathan Callen <abcd@gentoo.org> pkgconfig-0.26.ebuild: + Add prefix support; move prefix keywords from overlay 13 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -pkgconfig-0.25-r2.ebuild, -files/pkgconfig-0.25-dnl.patch: diff --git a/dev-util/pkgconfig/pkgconfig-0.26.ebuild b/dev-util/pkgconfig/pkgconfig-0.26.ebuild index a774ddfe69ca..c53e3749e14a 100644 --- a/dev-util/pkgconfig/pkgconfig-0.26.ebuild +++ b/dev-util/pkgconfig/pkgconfig-0.26.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.26.ebuild,v 1.7 2011/07/31 19:27:35 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.26.ebuild,v 1.8 2011/10/24 00:16:57 abcd Exp $ EAPI=4 -inherit flag-o-matic multilib +inherit flag-o-matic multilib libtool MY_P=pkg-config-${PV} @@ -13,7 +13,7 @@ SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="elibc_FreeBSD hardened" RDEPEND="dev-libs/glib:2 @@ -24,9 +24,13 @@ S=${WORKDIR}/${MY_P} DOCS=( AUTHORS NEWS README ) +src_prepare() { + elibtoolize # for FreeMiNT, bug #333429 +} + src_configure() { if ! has_version dev-util/pkgconfig; then - export GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/$(get_libdir)/glib-2.0/include" + export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" export GLIB_LIBS="-lglib-2.0" fi @@ -38,7 +42,18 @@ src_configure() { use elibc_FreeBSD && myconf="--enable-indirect-deps" econf \ - --docdir=/usr/share/doc/${PF}/html \ + --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ --with-installed-popt \ ${myconf} } + +src_install() { + default + + if use prefix; then + # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to + # simplify cross-prefix builds + echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} + doenvd "${T}"/99${PN} + fi +} |