diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-06-27 15:28:52 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-06-27 15:28:52 +0000 |
| commit | ffcb07ead07a3ba6ca3ebc4e93125d69f9bfe6ab (patch) | |
| tree | 9afcd81b589939ff02ce80dc0f9e85c48433989a /dev-libs | |
| parent | Stable on ppc; bug #183404. (diff) | |
| download | gentoo-2-ffcb07ead07a3ba6ca3ebc4e93125d69f9bfe6ab.tar.gz gentoo-2-ffcb07ead07a3ba6ca3ebc4e93125d69f9bfe6ab.tar.bz2 gentoo-2-ffcb07ead07a3ba6ca3ebc4e93125d69f9bfe6ab.zip | |
Fixup autotool handling #168198.
(Portage version: 2.1.3_rc5)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-1.2.10-automake.patch | 29 | ||||
| -rw-r--r-- | dev-libs/glib/glib-1.2.10-r5.ebuild | 6 |
3 files changed, 37 insertions, 4 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 595ab23429ca..12ba85159bd0 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.266 2007/06/05 19:06:25 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.267 2007/06/27 15:28:52 vapier Exp $ + + 27 Jun 2007; Mike Frysinger <vapier@gentoo.org> + +files/glib-1.2.10-automake.patch, glib-1.2.10-r5.ebuild: + Fixup autotool handling #168198. 05 Jun 2007; Daniel Gryniewicz <dang@gentoo.org> glib-2.12.12.ebuild: Add back elibtoolize for fbsd diff --git a/dev-libs/glib/files/glib-1.2.10-automake.patch b/dev-libs/glib/files/glib-1.2.10-automake.patch new file mode 100644 index 000000000000..c4f8fd32110c --- /dev/null +++ b/dev-libs/glib/files/glib-1.2.10-automake.patch @@ -0,0 +1,29 @@ +fix errors with newer automake: + +gmodule/Makefile.am:44: testgmodule_LDFLAGS must be set with `=' before using `+=' + +Makefile.am:73: BUILT_SOURCES multiply defined in condition TRUE ... +Makefile.am:11: ... `BUILT_SOURCES' previously defined here + +--- Makefile.am ++++ Makefile.am +@@ -70,7 +70,7 @@ + + CONFIGURE_DEPENDENCIES = acglib.m4 + +-BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h ++BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h + glibconfig.h: stamp-gc-h + @: + stamp-gc-h: config.status +--- gmodule/Makefile.am ++++ gmodule/Makefile.am +@@ -41,7 +41,7 @@ + libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib) + + noinst_PROGRAMS = testgmodule +-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ ++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ + testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ + + .PHONY: files release diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild index 87c8919528fd..60d853a0932d 100644 --- a/dev-libs/glib/glib-1.2.10-r5.ebuild +++ b/dev-libs/glib/glib-1.2.10-r5.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.51 2007/03/03 15:59:55 falco Exp $ - -WANT_AUTOMAKE="1.4" +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.52 2007/06/27 15:28:52 vapier Exp $ inherit autotools libtool flag-o-matic eutils portability @@ -23,6 +21,7 @@ src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${P}-automake.patch epatch "${FILESDIR}"/${P}-m4.patch epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679 @@ -35,6 +34,7 @@ src_unpack() { use ppc64 && use hardened && replace-flags -O[2-3] -O1 append-ldflags $(dlopen_lib) + rm -f acinclude.m4 #168198 eautoreconf elibtoolize } |