Skip to contentSkip to conversation

Automake-1.14 fixes

PATCH In review Marko Lindqvist 2 participants 7 messages Oct 25, 2013 – Oct 29, 2013

lore
Share & tools
lore

Marko Lindqvist

author
#0 lore raw

cover Automake-1.14 fixes

The following changes since commit 843a5dd8f8f0461e286d9fdb3ba55205b4275f88:

base.bbclass: fix nondeterministic PACKAGECONFIG processing order (2013-10-24 08:38:24 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib cazfi/am14
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=cazfi/am14

Marko Lindqvist (4):
libxcb: fix build with automake-1.14
libcheck: allow build with automake-1.14
libfm: upgrade to upstream version 1.1.2.2
libfm: allow build with automake-1.14

 .../xcb/libxcb/automake_1.14_fix.patch             | 27 ++++++++++++++++++++++
 meta/recipes-graphics/xcb/libxcb_1.9.1.bb          |  2 +-
 .../libcheck/ignore_automake_warning.patch         | 15 ++++++++++++
 meta/recipes-support/libcheck/libcheck_0.9.10.bb   |  1 +
 .../fix-make-parallelism-issue.patch               |  0
 .../libfm-1.1.2.2/ignore_automake_warnings.patch   | 14 +++++++++++
 .../libfm/{libfm_1.1.0.bb => libfm_1.1.2.2.bb}     |  7 +++---
 7 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch
 create mode 100644 meta/recipes-support/libcheck/libcheck/ignore_automake_warning.patch
 rename meta/recipes-support/libfm/{libfm-1.1.0 => libfm-1.1.2.2}/fix-make-parallelism-issue.patch (100%)
 create mode 100644 meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch
 rename meta/recipes-support/libfm/{libfm_1.1.0.bb => libfm_1.1.2.2.bb} (78%)
Signature · 1 line
1.8.4.rc3
author
#1 lore raw

PATCH 1/4 libxcb: fix build with automake-1.14

Signed-off-by Marko Lindqvist <[email protected]>
---
 .../xcb/libxcb/automake_1.14_fix.patch             | 27 ++++++++++++++++++++++
 meta/recipes-graphics/xcb/libxcb_1.9.1.bb          |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch
meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch new file +27 -0
new file mode 100644
index 0000000..0f1fc54
@@ -0,0 +1,27 @@
+Upstream-Status: Backport
+
+Signed-off-by: Marko Lindqvist <[email protected]>
+diff -Nurd libxcb-1.9.1/configure.ac libxcb-1.9.1/configure.ac
+--- libxcb-1.9.1/configure.ac	2013-05-30 18:38:01.000000000 +0300
++++ libxcb-1.9.1/configure.ac	2013-10-24 23:15:10.542507543 +0300
+@@ -7,15 +7,16 @@
+         1.9.1,
+         [[email protected]])
+ AC_CONFIG_SRCDIR([xcb.pc.in])
+-# Set common system defines for POSIX extensions, such as _GNU_SOURCE
+-# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
+-# to avoid autoconf errors.
+-AC_USE_SYSTEM_EXTENSIONS
+
+ # Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
++# Set common system defines for POSIX extensions, such as _GNU_SOURCE
++# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
++# to avoid autoconf errors.
++AC_USE_SYSTEM_EXTENSIONS
++
+ AM_PATH_PYTHON([2.6])
+
+ PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
meta/recipes-graphics/xcb/libxcb_1.9.1.bb +1 -1
index a40a1c1..b654800 100644
@@ -3,7 +3,7 @@ include libxcb.inc
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7"
 
-PR = "r0"
+SRC_URI += "file://automake_1.14_fix.patch"
 
 DEPENDS += "libxdmcp"
Signature · 1 line
1.8.4.rc3
author
#2 lore raw

PATCH 2/4 libcheck: allow build with automake-1.14

Do not consider automake warnings about future incompatibility errors.

Signed-off-by Marko Lindqvist <[email protected]>
---
 .../libcheck/libcheck/ignore_automake_warning.patch       | 15 +++++++++++++++
 meta/recipes-support/libcheck/libcheck_0.9.10.bb          |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 meta/recipes-support/libcheck/libcheck/ignore_automake_warning.patch
meta/recipes-support/libcheck/libcheck/ignore_automake_warning.patch new file +15 -0
new file mode 100644
index 0000000..51c5863
@@ -0,0 +1,15 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Marko Lindqvist <[email protected]>
+diff -Nurd check-0.9.10/configure.ac check-0.9.10/configure.ac
+--- check-0.9.10/configure.ac	2013-04-18 13:19:02.000000000 +0300
++++ check-0.9.10/configure.ac	2013-10-25 00:26:43.102413363 +0300
+@@ -26,7 +26,7 @@
+ AC_USE_SYSTEM_EXTENSIONS
+
+ # really severe build strictness
+-AM_INIT_AUTOMAKE([-Wall -Werror gnits 1.9.6])
++AM_INIT_AUTOMAKE([-Wall gnits 1.9.6])
+
+ # From patch 2803433, request system extensions to generate 64-bit safe code
+ AC_USE_SYSTEM_EXTENSIONS
meta/recipes-support/libcheck/libcheck_0.9.10.bb +1 -0
index a22271a..294b23e 100644
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \
            file://libcheck_fix_for_automake-1.12.patch \
+           file://ignore_automake_warning.patch \
           "
 
 SRC_URI[md5sum] = "6d10a8efb9a683467b92b3bce97aeb30"
Signature · 1 line
1.8.4.rc3
author
#3 lore raw

PATCH 3/4 libfm: upgrade to upstream version 1.1.2.2

In reply to Marko Lindqvist
Signed-off-by Marko Lindqvist <[email protected]>
---
 .../{libfm-1.1.0 => libfm-1.1.2.2}/fix-make-parallelism-issue.patch | 0
 meta/recipes-support/libfm/{libfm_1.1.0.bb => libfm_1.1.2.2.bb}     | 6 ++----
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-support/libfm/{libfm-1.1.0 => libfm-1.1.2.2}/fix-make-parallelism-issue.patch (100%)
 rename meta/recipes-support/libfm/{libfm_1.1.0.bb => libfm_1.1.2.2.bb} (82%)
meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch renamed from meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch +0 -0
similarity index 100%
rename from meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch
rename to meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch
meta/recipes-support/libfm/libfm_1.1.2.2.bb renamed from meta/recipes-support/libfm/libfm_1.1.0.bb +2 -4
similarity index 82%
rename from meta/recipes-support/libfm/libfm_1.1.0.bb
rename to meta/recipes-support/libfm/libfm_1.1.2.2.bb
index 23f132a..1146d16 100644
@@ -10,14 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 SECTION = "x11/libs"
 DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif"
 
-PR = "r0"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
            file://fix-make-parallelism-issue.patch \
            "
 
-SRC_URI[md5sum] = "a5bc8b8291cf810c659bfb3af378b5de"
-SRC_URI[sha256sum] = "b9426e588670b53570b808c49abd1d103863614dd3622559b8c3ef1392fe0b3d"
+SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08"
+SRC_URI[sha256sum] = "158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682"
 
 inherit autotools pkgconfig
Signature · 1 line
1.8.4.rc3
author
#4 lore raw

PATCH 4/4 libfm: allow build with automake-1.14

In reply to Marko Lindqvist

Do not consider automake warnings about future incompatibility errors.

Signed-off-by Marko Lindqvist <[email protected]>
---
 .../libfm/libfm-1.1.2.2/ignore_automake_warnings.patch     | 14 ++++++++++++++
 meta/recipes-support/libfm/libfm_1.1.2.2.bb                |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch
meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch new file +14 -0
new file mode 100644
index 0000000..58a2f09
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Marko Lindqvist <[email protected]>
+diff -Nurd libfm-1.1.2.2/configure.ac libfm-1.1.2.2/configure.ac
+--- libfm-1.1.2.2/configure.ac	2013-08-22 23:16:09.000000000 +0300
++++ libfm-1.1.2.2/configure.ac	2013-10-25 01:35:18.110323079 +0300
+@@ -3,7 +3,7 @@
+
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [1.1.2.2], [http://pcmanfm.sourceforge.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Wall foreign])
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([config.h])
meta/recipes-support/libfm/libfm_1.1.2.2.bb +1 -0
index 1146d16..8460223 100644
@@ -12,6 +12,7 @@ DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
            file://fix-make-parallelism-issue.patch \
+           file://ignore_automake_warnings.patch \
            "
 
 SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08"
Signature · 1 line
1.8.4.rc3
#5 lore raw

Re: [PATCH 4/4] libfm: allow build with automake-1.14

Marko

Quoted 2 lines · Marko Lindqvist

Do not consider automake warnings about future incompatibility errors.

hmmm so disabling Werror is working around and I consider it degradation in code quality, is there any alternative ? may be fix the code itself to not generate the warning at all ?

Quoted 47 lines
Signed-off-by Marko Lindqvist <[email protected]>
---
 .../libfm/libfm-1.1.2.2/ignore_automake_warnings.patch     | 14 ++++++++++++++
 meta/recipes-support/libfm/libfm_1.1.2.2.bb                |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch
meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch new file +14 -0
new file mode 100644
index 0000000..58a2f09
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Marko Lindqvist <[email protected]>
+diff -Nurd libfm-1.1.2.2/configure.ac libfm-1.1.2.2/configure.ac
+--- libfm-1.1.2.2/configure.ac 2013-08-22 23:16:09.000000000 +0300
++++ libfm-1.1.2.2/configure.ac 2013-10-25 01:35:18.110323079 +0300
+@@ -3,7 +3,7 @@
+
+ AC_PREREQ([2.63])
+ AC_INIT([libfm], [1.1.2.2], [http://pcmanfm.sourceforge.net/])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Wall foreign])
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([config.h])
meta/recipes-support/libfm/libfm_1.1.2.2.bb +1 -1
index 1146d16..8460223 100644
@@ -12,6 +12,7 @@ DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
            file://fix-make-parallelism-issue.patch \
+           file://ignore_automake_warnings.patch \
            "
 
 SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08"
--

1.8.4.rc3

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

author
#6 lore raw

Re: [PATCH 4/4] libfm: allow build with automake-1.14

Quoted 8 lines · Khem Raj

Marko

Quoted 2 lines · Marko Lindqvist

Do not consider automake warnings about future incompatibility errors.

hmmm so disabling Werror is working around and I consider it degradation in code quality, is there any alternative ?

I agree on principle. That's why I wouldn't even consider submitting
this to upstream, as future versions should handle this correctly. I think it's ok for us to patch the current version this way, as the warnings are about the future only.

Quoted 2 lines

may be fix the code itself to not
generate the warning at all ?

That's something that (upstream) must do anyway before automake-2.0
comes out and turns these warnings in to errors. I'm not going to figure these out for every upstream that has such a problem. When we were preparing for automake-1.13, I submitted fixes to nearly 100 upstreams. While I usually am happy to fix the problems I encounter, I'm not ready to make anything like that again. I'll leave proper fixes for these problems for upstreams to make.

- ML