Skip to contentSkip to conversation

fix for older glib-2.0 versions to build with recent autotools

PATCH Applied Alexander Stohr 2 participants 2 messages Oct 26, 2010 – Nov 6, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

Signature · 2 lines
GRATIS! Movie-FLAT mit über 300 Videos. 
Jetzt freischalten unter http://portal.gmx.net/de/go/maxdome
files/glib-2.6.4-fix-autotools-fiac.patch +12 -0
diff -Nru glib-2.0.orig/files/glib-2.6.4-fix-autotools-fiac.patch glib-2.0/files/glib-2.6.4-fix-autotools-fiac.patch
@@ -0,0 +1,12 @@
+diff -Nru glib-2.6.4.orig/acglib.m4 glib-2.6.4/acglib.m4
+--- glib-2.6.4.orig/acglib.m4	2004-02-27 01:57:25.000000000 +0100
++++ glib-2.6.4/acglib.m4	2010-10-26 14:06:54.000000000 +0200
+@@ -117,7 +117,7 @@
+       [$2],
+       [echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
+-m4_ifvaln([$3],[$3])dnl])dnl
++m4_ifvaln([$3],[$3])dnl])
+ ac_compile="$glib_ac_compile_save"
+ rm -f conftest.$ac_objext conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl
+ ])# GLIB_CHECK_COMPILE_WARNINGS
glib-2.0_2.12.12.bb +2 -1
diff -Nru glib-2.0.orig/glib-2.0_2.12.12.bb glib-2.0/glib-2.0_2.12.12.bb
@@ -3,7 +3,8 @@
 
 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"
glib-2.0_2.20.3.bb +1 -0
diff -Nru glib-2.0.orig/glib-2.0_2.20.3.bb glib-2.0/glib-2.0_2.20.3.bb
@@ -5,6 +5,7 @@
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2;name=tarball \
   file://glibconfig-sysdefs.h \
   file://configure-libtool.patch \
+  file://glib-2.6.4-fix-autotools-fiac.patch \
 "
 SRC_URI_append_arm = " file://atomic-thumb.patch"
 
glib-2.0_2.20.4.bb +1 -0
diff -Nru glib-2.0.orig/glib-2.0_2.20.4.bb glib-2.0/glib-2.0_2.20.4.bb
@@ -5,6 +5,7 @@
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2 \
   file://glibconfig-sysdefs.h \
   file://configure-libtool.patch \
+  file://glib-2.6.4-fix-autotools-fiac.patch \
 "
 SRC_URI_append_arm = " file://atomic-thumb.patch"
 
glib-2.0_2.6.4.bb +2 -1
diff -Nru glib-2.0.orig/glib-2.0_2.6.4.bb glib-2.0/glib-2.0_2.6.4.bb
@@ -24,7 +24,8 @@
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
            file://glibinclude.patch;striplevel=2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch"
+           file://configure-libtool.patch \
+           file://glib-2.6.4-fix-autotools-fiac.patch"
 
 S = "${WORKDIR}/glib-${PV}"
 
glib-2.0_2.8.6.bb +2 -1
diff -Nru glib-2.0.orig/glib-2.0_2.8.6.bb glib-2.0/glib-2.0_2.8.6.bb
@@ -20,7 +20,8 @@
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/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"
 
 S = "${WORKDIR}/glib-${PV}"
 
Applied
#1 lore raw
Quoted 13 lines · Alexander Stohr

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.

Quoted 2 lines

the fix removes those problematic extra keyword.

Applied. Next time please follow the patch submission guidelines described in wiki otherwise I will ignore such patches which need manual work to be applied.

-Khem