diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-15 08:07:11 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-15 08:07:11 +0000 |
| commit | 1e2329d41639b56167391a60b3c60d2727f3e4a3 (patch) | |
| tree | 5631fcbc321fe9830fed60952e0504b744e6ef4f /dev-util/pkgconfig | |
| parent | Unmask perl-5.12.1 (diff) | |
| download | gentoo-2-1e2329d41639b56167391a60b3c60d2727f3e4a3.tar.gz gentoo-2-1e2329d41639b56167391a60b3c60d2727f3e4a3.tar.bz2 gentoo-2-1e2329d41639b56167391a60b3c60d2727f3e4a3.zip | |
Fix for sys-devel/autoconf >= 2.66 compability wrt #326939.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/pkgconfig')
| -rw-r--r-- | dev-util/pkgconfig/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch | 12 | ||||
| -rw-r--r-- | dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild | 6 |
3 files changed, 6 insertions, 17 deletions
diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog index 9d81d6ed8a05..0485f416ddb2 100644 --- a/dev-util/pkgconfig/ChangeLog +++ b/dev-util/pkgconfig/ChangeLog @@ -1,13 +1,12 @@ # ChangeLog for dev-util/pkgconfig # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.82 2010/07/11 12:28:28 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.83 2010/07/15 08:07:11 ssuominen Exp $ *pkgconfig-0.25-r2 (11 Jul 2010) 11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> +pkgconfig-0.25-r2.ebuild, +files/pkgconfig-0.25-dnl.patch: - Fix for sys-devel/autoconf-2.66 compat (but commit unkeyworded until it's - sorted out). + Fix for sys-devel/autoconf >= 2.66 compability wrt #326939. *pkgconfig-0.25-r1 (17 Jun 2010) diff --git a/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch b/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch index 3dc6b6e22a5c..00e450e777b4 100644 --- a/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch +++ b/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch @@ -1,4 +1,5 @@ http://bugs.gentoo.org/326939 +http://repos.archlinux.org/wsvn/packages/pkg-config/trunk/autoconf-2.66.patch --- pkg.m4 +++ pkg.m4 @@ -7,16 +8,7 @@ http://bugs.gentoo.org/326939 installed software in a non-standard prefix. -_PKG_TEXT])dnl -+_PKG_TEXT]) ++_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) -@@ -146,7 +146,7 @@ - - _PKG_TEXT - --To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl -+To get pkg-config, see <http://pkg-config.freedesktop.org/>.]) - ]) - else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff --git a/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild index 7978378de8fc..f997526916a1 100644 --- a/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild +++ b/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild,v 1.1 2010/07/11 12:28:28 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild,v 1.2 2010/07/15 08:07:11 ssuominen Exp $ EAPI=2 inherit eutils flag-o-matic @@ -13,8 +13,7 @@ SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="elibc_FreeBSD hardened" DEPEND=">=dev-libs/popt-1.15" @@ -22,7 +21,6 @@ DEPEND=">=dev-libs/popt-1.15" S=${WORKDIR}/${MY_P} src_prepare() { - # XXX: Bug in autoconf 2.66, or pkg-config? epatch "${FILESDIR}"/${P}-dnl.patch } |