tetromino 15/05/31 21:03:49
Modified: ChangeLog pkgconfig-9999.ebuild
pkgconfig-0.28-r3.ebuild
Log:
We cannot use autotools.eclass in pkgconfig, it creates a circular dependency
(bug #550856, thanks to Fabian Groffen, Mike Gilbert).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
0x18E5B6F2D8D5EC8D)
Revision Changes Path
1.172 dev-util/pkgconfig/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?rev=1.172&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?rev=1.172&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/ChangeLog?r1=1.171&r2=1.172
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- ChangeLog 27 May 2015 13:12:57 -0000 1.171
+++ ChangeLog 31 May 2015 21:03:49 -0000 1.172
@@ -1,6 +1,12 @@
# ChangeLog for dev-util/pkgconfig
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.171
2015/05/27 13:12:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.172
2015/05/31 21:03:49 tetromino Exp $
+
+ 31 May 2015; Alexandre Rostovtsev <tetrom...@gentoo.org>
+ pkgconfig-0.28-r3.ebuild, pkgconfig-9999.ebuild,
+ files/pkgconfig-0.28-lfs.patch:
+ We cannot use autotools.eclass in pkgconfig, it creates a circular dependency
+ (bug #550856, thanks to Fabian Groffen, Mike Gilbert).
27 May 2015; Alexandre Rostovtsev <tetrom...@gentoo.org>
-pkgconfig-0.28-r1.ebuild:
1.17 dev-util/pkgconfig/pkgconfig-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?rev=1.17&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?rev=1.17&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild?r1=1.16&r2=1.17
Index: pkgconfig-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pkgconfig-9999.ebuild 27 May 2015 06:32:02 -0000 1.16
+++ pkgconfig-9999.ebuild 31 May 2015 21:03:49 -0000 1.17
@@ -1,18 +1,18 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v
1.16 2015/05/27 06:32:02 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v
1.17 2015/05/31 21:03:49 tetromino Exp $
EAPI=5
-# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
-# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
-WANT_AUTOMAKE=1.12
-
+# Do not inherit autotools in non-live ebuild - causes circular dependency,
bug #550856
inherit eutils flag-o-matic libtool multilib multilib-minimal
MY_P=pkg-config-${PV}
if [[ ${PV} == *9999* ]]; then
+ # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
+ # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
+ WANT_AUTOMAKE=1.12
EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
inherit autotools git-r3
1.3 dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild?r1=1.2&r2=1.3
Index: pkgconfig-0.28-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pkgconfig-0.28-r3.ebuild 27 May 2015 06:32:02 -0000 1.2
+++ pkgconfig-0.28-r3.ebuild 31 May 2015 21:03:49 -0000 1.3
@@ -1,18 +1,18 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild,v 1.2
2015/05/27 06:32:02 tetromino Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild,v 1.3
2015/05/31 21:03:49 tetromino Exp $
EAPI=5
-# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
-# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
-WANT_AUTOMAKE=1.12
-
-inherit autotools eutils flag-o-matic libtool multilib multilib-minimal
+# Do not inherit autotools in non-live ebuild - causes circular dependency,
bug #550856
+inherit eutils flag-o-matic libtool multilib multilib-minimal
MY_P=pkg-config-${PV}
if [[ ${PV} == *9999* ]]; then
+ # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
+ # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
+ WANT_AUTOMAKE=1.12
EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
inherit autotools git-r3
@@ -43,16 +43,18 @@
sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc ||
die #434320
- # Large file support, fixed in git; requires eautoreconf; bug #550508
+ # Large file support, fixed in upstream git; bug #550508
epatch "${FILESDIR}"/${P}-lfs.patch
+ # lfs patch touches config.h.in; need this hack to prevent autoreconf
and automake
+ touch aclocal.m4 config.h.in Makefile.in
epatch_user
- #if [[ ${PV} == *9999* ]]; then
+ if [[ ${PV} == *9999* ]]; then
eautoreconf
- #else
- # elibtoolize # Required for FreeMiNT wrt #333429
- #fi
+ else
+ elibtoolize # Required for FreeMiNT wrt #333429
+ fi
}
multilib_src_configure() {
