diff options
| author |   Leonardo Boshell <leonardop@gentoo.org> | 2005-07-18 10:27:06 +0000 |
|---|---|---|
| committer | Leonardo Boshell <leonardop@gentoo.org> | 2005-07-18 10:27:06 +0000 |
| commit | c857f85e5399379838e27c2027df286e364337f5 (patch) | |
| tree | 887d27a94d7a710b92437d3577549eb9a6926e53 /dev-util | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-c857f85e5399379838e27c2027df286e364337f5.tar.gz gentoo-2-c857f85e5399379838e27c2027df286e364337f5.tar.bz2 gentoo-2-c857f85e5399379838e27c2027df286e364337f5.zip | |
Adding patch to fix compile-time tests (bug #98651)
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/pkgconfig/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/pkgconfig/files/pkg-config-0.18.1-checks.patch | 26 | ||||
| -rw-r--r-- | dev-util/pkgconfig/pkgconfig-0.18.1.ebuild | 6 |
3 files changed, 36 insertions, 2 deletions
diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog index 63faabb5daf2..febc5d8b357e 100644 --- a/dev-util/pkgconfig/ChangeLog +++ b/dev-util/pkgconfig/ChangeLog @@ -1,6 +1,10 @@ # 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.30 2005/07/05 20:48:03 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.31 2005/07/18 10:27:06 leonardop Exp $ + + 18 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> pkgconfig-0.18.1.ebuild, + files/pkg-config-0.18.1-checks.patch: + Fix compilation-time tests, resolves bug #98651. 05 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> pkgconfig-0.18.1.ebuild, files/pkg-config-0.18.1-pc_path.patch: diff --git a/dev-util/pkgconfig/files/pkg-config-0.18.1-checks.patch b/dev-util/pkgconfig/files/pkg-config-0.18.1-checks.patch new file mode 100644 index 000000000000..2b09a64ac7fa --- /dev/null +++ b/dev-util/pkgconfig/files/pkg-config-0.18.1-checks.patch @@ -0,0 +1,26 @@ +diff -NurdB pkg-config-0.18.1/check/Makefile.am pkg-config-0.18.1-patched/check/Makefile.am +--- pkg-config-0.18.1/check/Makefile.am 2005-06-27 14:37:41.000000000 -0500 ++++ pkg-config-0.18.1-patched/check/Makefile.am 2005-07-18 03:46:37.000000000 -0500 +@@ -1,6 +1,9 @@ + +-TESTS = check-cflags check-libs check-define-variable \ +- check-libs-private check-requires-private ++TESTS = check-cflags check-define-variable check-libs-private ++ ++if !ENABLE_INDIRECT_DEPS ++TESTS += check-libs check-requires-private ++endif + + EXTRA_DIST = $(TESTS) common simple.pc requires-test.pc public-dep.pc \ + private-dep.pc +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-18 03:32:07.000000000 -0500 +@@ -59,6 +59,7 @@ + AC_MSG_RESULT($use_indirect_deps) + + AC_DEFINE_UNQUOTED(ENABLE_INDIRECT_DEPS, `test $use_indirect_deps = no; echo $?`, [Link library to all dependent libraries, not only directly needed ones]) ++AM_CONDITIONAL(ENABLE_INDIRECT_DEPS, test x$use_indirect_deps = xyes) + + AC_MSG_CHECKING([for Win32]) + case "$host" in diff --git a/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild index cb62c252e7fc..bf37b2dc9b79 100644 --- a/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild +++ b/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild @@ -1,6 +1,6 @@ # 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.2 2005/07/05 20:48:03 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild,v 1.3 2005/07/18 10:27:06 leonardop Exp $ inherit eutils flag-o-matic gnome.org @@ -26,9 +26,13 @@ src_unpack() { # Set the default search path correctly epatch ${FILESDIR}/${MY_P}-pc_path.patch + # Fix compilation-time tests. See bug #98651. + epatch ${FILESDIR}/${MY_P}-checks.patch einfo "Running autoconf" autoconf || die "Autoconf failed" + einfo "Running automake" + WANT_AUTOMAKE=1.7 automake || die "Autoconf failed" } src_compile() { |