From f8d4a50cc0a19a74baeb51279e829861da04302d Mon Sep 17 00:00:00 2001 From: Alexander Stohr Date: Tue, 26 Oct 2010 02:55:49 +0000 Subject: fix for older glib-2.0 versions to build with recent autotools the attached patch bundles a single fix for glib-2.0 for recipes built upon glib tarballs 2.6.4 to 2.20.4. later versions have the problem fixed in tarball (e.g. 2.22.1 and newer). the problem happens when you need to update autotools for some other reason (e.g. building some newer package) whilst not wanting to update glib at the very same time. it manifests by a badly clobbered "fi" in configure step and thus a still open nesting level when the script ends. the auto tools generated script exposes "fiAC_..." that originates from a too extensive use of the "dnl" statemnt. that construct is only critical with newer auto tools. the fix removes those problematic extra keyword. regards, Alex. see for reference: http://bugs.gentoo.org/show_bug.cgi?id=307775 http://git.gnome.org/browse/glib/commit/?id=c24f6e55276fac68b08df34b0d350f65afe994d9 Signed-off-by: Khem Raj --- recipes/glib-2.0/glib-2.0_2.12.12.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes/glib-2.0/glib-2.0_2.12.12.bb') diff --git a/recipes/glib-2.0/glib-2.0_2.12.12.bb b/recipes/glib-2.0/glib-2.0_2.12.12.bb index 12b24e2a7f..27fbb94cd6 100644 --- a/recipes/glib-2.0/glib-2.0_2.12.12.bb +++ b/recipes/glib-2.0/glib-2.0_2.12.12.bb @@ -3,7 +3,8 @@ PR = "${INC_PR}.0" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch" + file://configure-libtool.patch \ + file://glib-2.6.4-fix-autotools-fiac.patch" SRC_URI[md5sum] = "0b3a42098243d054475ff6eb51ed2be1" -- cgit 1.2.3-korg