Automake-1.13

PATCH In review Marko Lindqvist 2 participants 5 messages Aug 22, 2013 – Aug 25, 2013

Share & tools

Marko Lindqvist

author

2013-08-22 21:37 UTC #0 lore raw

cover Automake-1.13

gtk-engines fix updated, and the automake update patch itself added to the set. It's probably better to leave latter to beginning of new cycle (1.6) than to push it in just before 1.5 freeze, as it might break number of recipes in other layers.

The following changes since commit e473e60d5572f36829068f6d3db9ce9ba9633d71:

mkfontscale: This no longer needs a full libx11, xproto suffices (2013-08-22 18:29:50 +0100)

are available in the git repository at:

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

Marko Lindqvist (2):
gtk-engines: fix build with automake-1.13
automake: update to upstream version 1.13.4

 .../prefer-cpio-over-pax-for-ustar-archives.patch  |   37 ++++++++++----------
 .../{automake_1.12.6.bb => automake_1.13.4.bb}     |    6 ++--
 .../gtk-engines-2.20.2/substitute-tests.patch      |   37 ++++++++++++++++++++
 .../gtk-engines/gtk-engines_2.20.2.bb              |    3 +-
 4 files changed, 60 insertions(+), 23 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.12.6.bb => automake_1.13.4.bb} (90%)
 create mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch

Signature · 1 line

1.7.10.4

Marko Lindqvist

author

2013-08-22 21:37 UTC #1 lore raw

PATCH 1/2 gtk-engines: fix build with automake-1.13

Add patch substitute-tests.patch that works around automake TESTS limitation.
See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13771.

Signed-off-by Marko Lindqvist <[email protected]>

---
 .../gtk-engines-2.20.2/substitute-tests.patch      |   37 ++++++++++++++++++++
 .../gtk-engines/gtk-engines_2.20.2.bb              |    3 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch

meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch new file +37 -0

new file mode 100644
index 0000000..5c557ba
@@ -0,0 +1,37 @@
+Upstream-Status: Pending
+
+Signed-off-by: Marko Lindqvist <[email protected]>
+diff -Nurd gtk-engines-2.20.2/configure.ac gtk-engines-2.20.2/configure.ac
+--- gtk-engines-2.20.2/configure.ac	2010-10-01 15:42:37.000000000 +0300
++++ gtk-engines-2.20.2/configure.ac	2013-08-20 02:50:27.930510565 +0300
+@@ -166,6 +166,9 @@
+
+ AC_SUBST(DEVELOPMENT_CFLAGS)
+
++AC_SUBST([exported_symbols_tests], [[$(EXPORTED_SYMBOLS_TESTS)]])
++AC_SUBST([torture_test_tests], [[$(TORTURE_TEST_TESTS)]])
++
+ AM_CONFIG_HEADER([engines/support/config.h])
+
+ AC_CONFIG_FILES([
+diff -Nurd gtk-engines-2.20.2/test/Makefile.am gtk-engines-2.20.2/test/Makefile.am
+--- gtk-engines-2.20.2/test/Makefile.am	2010-09-19 18:18:21.000000000 +0300
++++ gtk-engines-2.20.2/test/Makefile.am	2013-08-20 02:50:36.842510865 +0300
+@@ -66,7 +66,7 @@
+ # Prefix with exported_
+ EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
+
+-TESTS += $(EXPORTED_SYMBOLS_TESTS)
++TESTS += @exported_symbols_tests@
+
+
+ #############################################################
+@@ -88,7 +88,7 @@
+ TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
+
+ # Add TORTURE_TEST_ENGINES to list of tests
+-TESTS += $(TORTURE_TEST_TESTS)
++TESTS += @torture_test_tests@
+
+ # Possible other tests:
+ #  - An extensive theme switch tests that loads/unloads the engine

meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +2 -1

index 32d7be4..f899307 100644
@@ -37,6 +37,7 @@ python populate_packages_prepend() {
     # TODO: mark theme packages as arch all
 }
 
-SRC_URI += "file://glib-2.32.patch"
+SRC_URI += "file://glib-2.32.patch \
+            file://substitute-tests.patch"
 SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f"
 SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"

Signature · 1 line

1.7.10.4

Marko Lindqvist

author

2013-08-22 21:37 UTC #2 lore raw

PATCH 2/2 automake: update to upstream version 1.13.4

prefer-cpio-over-pax-for-ustar-archives.patch updated to apply

Signed-off-by Marko Lindqvist <[email protected]>

---
 .../prefer-cpio-over-pax-for-ustar-archives.patch  |   37 ++++++++++----------
 .../{automake_1.12.6.bb => automake_1.13.4.bb}     |    6 ++--
 2 files changed, 21 insertions(+), 22 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.12.6.bb => automake_1.13.4.bb} (90%)

meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch +19 ~~-18~~

index 4627855..6558a00 100644
@@ -19,24 +19,13 @@ Updated for version 1.11.3:
 Signed-off-by: Nitin A Kamble <[email protected]>
 Date: 2011/03/14
 
-Index: automake-1.11.3/m4/tar.m4
-===================================================================
---- automake-1.11.3.orig/m4/tar.m4	2012-01-31 03:41:18.000000000 -0800
-+++ automake-1.11.3/m4/tar.m4	2012-03-14 17:36:11.901303777 -0700
-@@ -31,7 +31,7 @@ m4_if([$1], [v7],
-               [m4_fatal([Unknown tar format])])
- AC_MSG_CHECKING([how to create a $1 tar archive])
- # Loop over all known methods to create a tar archive until one works.
--_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
- _am_tools=${am_cv_prog_tar_$1-$_am_tools}
- # Do not fold the above two line into one, because Tru64 sh and
- # Solaris sh will not grok spaces in the rhs of `-'.
-Index: automake-1.11.3/Makefile.in
-===================================================================
---- automake-1.11.3.orig/Makefile.in	2012-02-01 02:37:59.000000000 -0800
-+++ automake-1.11.3/Makefile.in	2012-03-14 17:38:03.530869197 -0700
-@@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+Updated for version 1.13.2:
+Signed-off-by: Marko Lindqvist <[email protected]>
+
+diff -Nurd automake-1.13.2/Makefile.in automake-1.13.2/Makefile.in
+--- automake-1.13.2/Makefile.in	2013-05-15 23:12:58.000000000 +0300
++++ automake-1.13.2/Makefile.in	2013-05-23 02:13:41.364026301 +0300
+@@ -141,7 +141,7 @@
  	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
  	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \
  	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \

@@ -45,3 +34,15 @@ Index: automake-1.11.3/Makefile.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+diff -Nurd automake-1.13.2/m4/tar.m4 automake-1.13.2/m4/tar.m4
+--- automake-1.13.2/m4/tar.m4	2013-05-13 23:12:48.000000000 +0300
++++ automake-1.13.2/m4/tar.m4	2013-05-23 02:13:26.600025805 +0300
+@@ -26,7 +26,7 @@
+ AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+ # We'll loop over all known methods to create a tar archive until one works.
+-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
+
+ m4_if([$1], [v7],
+   [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],

meta/recipes-devtools/automake/automake_1.13.4.bb renamed from meta/recipes-devtools/automake/automake_1.12.6.bb +2 -4

similarity index 90%
rename from meta/recipes-devtools/automake/automake_1.12.6.bb
rename to meta/recipes-devtools/automake/automake_1.13.4.bb
index 549051b..e3db834 100644
@@ -26,10 +26,8 @@ SRC_URI += "${PATHFIXPATCH} \
             file://py-compile-compile-only-optimized-byte-code.patch \
             file://buildtest.patch"
 
-SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026"
-SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef"
-
-PR = "r0"
+SRC_URI[md5sum] = "9199e266993a5bbdc914923349d51e3e"
+SRC_URI[sha256sum] = "4c93abc0bff54b296f41f92dd3aa1e73e554265a6f719df465574983ef6f878c"
 
 do_install_append () {
     install -d ${D}${datadir}

Signature · 1 line

1.7.10.4

Saul Wold

2013-08-23 16:19 UTC #3 lore raw

Re: [PATCH 2/2] automake: update to upstream version 1.13.4

Quoted 72 lines · Marko Lindqvist

prefer-cpio-over-pax-for-ustar-archives.patch updated to apply

Signed-off-by Marko Lindqvist <[email protected]>

---
  .../prefer-cpio-over-pax-for-ustar-archives.patch  |   37 ++++++++++----------
  .../{automake_1.12.6.bb => automake_1.13.4.bb}     |    6 ++--
  2 files changed, 21 insertions(+), 22 deletions(-)

rename meta/recipes-devtools/automake/{automake_1.12.6.bb => automake_1.13.4.bb} (90%)

meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch +19 ~~-18~~

index 4627855..6558a00 100644
@@ -19,24 +19,13 @@ Updated for version 1.11.3:
  Signed-off-by: Nitin A Kamble <[email protected]>
  Date: 2011/03/14
 
-Index: automake-1.11.3/m4/tar.m4
-===================================================================
---- automake-1.11.3.orig/m4/tar.m4	2012-01-31 03:41:18.000000000 -0800
-+++ automake-1.11.3/m4/tar.m4	2012-03-14 17:36:11.901303777 -0700
-@@ -31,7 +31,7 @@ m4_if([$1], [v7],
-               [m4_fatal([Unknown tar format])])
- AC_MSG_CHECKING([how to create a $1 tar archive])
- # Loop over all known methods to create a tar archive until one works.
--_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
- _am_tools=${am_cv_prog_tar_$1-$_am_tools}
- # Do not fold the above two line into one, because Tru64 sh and
- # Solaris sh will not grok spaces in the rhs of `-'.
-Index: automake-1.11.3/Makefile.in
-===================================================================
---- automake-1.11.3.orig/Makefile.in	2012-02-01 02:37:59.000000000 -0800
-+++ automake-1.11.3/Makefile.in	2012-03-14 17:38:03.530869197 -0700
-@@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+Updated for version 1.13.2:
+Signed-off-by: Marko Lindqvist <[email protected]>
+
+diff -Nurd automake-1.13.2/Makefile.in automake-1.13.2/Makefile.in
+--- automake-1.13.2/Makefile.in	2013-05-15 23:12:58.000000000 +0300
++++ automake-1.13.2/Makefile.in	2013-05-23 02:13:41.364026301 +0300
+@@ -141,7 +141,7 @@
   	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
   	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \
   	$(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \

@@ -45,3 +34,15 @@ Index: automake-1.11.3/Makefile.in
   am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
   	$(ACLOCAL_M4)
   am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+diff -Nurd automake-1.13.2/m4/tar.m4 automake-1.13.2/m4/tar.m4
+--- automake-1.13.2/m4/tar.m4	2013-05-13 23:12:48.000000000 +0300
++++ automake-1.13.2/m4/tar.m4	2013-05-23 02:13:26.600025805 +0300
+@@ -26,7 +26,7 @@
+ AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+ # We'll loop over all known methods to create a tar archive until one works.
+-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
+
+ m4_if([$1], [v7],
+   [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],

meta/recipes-devtools/automake/automake_1.13.4.bb renamed from meta/recipes-devtools/automake/automake_1.12.6.bb +0 -0

similarity index 90%
rename from meta/recipes-devtools/automake/automake_1.12.6.bb
rename to meta/recipes-devtools/automake/automake_1.13.4.bb
index 549051b..e3db834 100644
@@ -26,10 +26,8 @@ SRC_URI += "${PATHFIXPATCH} \
              file://py-compile-compile-only-optimized-byte-code.patch \
              file://buildtest.patch"

meta/recipes-devtools/automake/automake_1.13.4.bb SRC_URI += "${PATHFIXPATCH} \ · line 33

Quoted 10 lines

meta/recipes-devtools/automake/automake_1.13.4.bb renamed from meta/recipes-devtools/automake/automake_1.12.6.bb +2 -4

 
-SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026"
-SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef"
-
-PR = "r0"
+SRC_URI[md5sum] = "9199e266993a5bbdc914923349d51e3e"
+SRC_URI[sha256sum] = "4c93abc0bff54b296f41f92dd3aa1e73e554265a6f719df465574983ef6f878c"
 
  do_install_append () {
      install -d ${D}${datadir}

Seems this update might have a perl script that is hard coded and will need to be worked on. This occurs with a toolchain build:
bitbake core-image-sato -c populate_sdk

| Computing transaction...error: Can't install nativesdk-automake-1.13.4-r0@x86_64_nativesdk: no package provides /bin/perl |

Sau!

Marko Lindqvist

author

2013-08-25 19:13 UTC #4 lore raw

Re: [PATCH 2/2] automake: update to upstream version 1.13.4

Quoted 7 lines · Saul Wold

Quoted 1 line
Seems this update might have a perl script that is hard coded and will need to be worked on. This occurs with a toolchain build:
bitbake core-image-sato -c populate_sdk
| Computing transaction...error: Can't install nativesdk-automake-1.13.4-r0@x86_64_nativesdk: no package provides /bin/perl

I couldn't reproduce, and grepping for "/bin/perl" reveals nothing
that would be new since 1.12.6.

There's one perl handling related error in the patch - recipe has old
version number hardcoded when adjusting perl paths. It needs to be fixed in any case, and we can hope that it fixes the issue you are experiencing. I'll make the version number unhardcoding separate patch so it can be applied already before the automake update. I'll push updated series to contrib tree to cazfi/am13 branch for those interested (probably late tonight or tomorrow), but won't send pull request before 1.6 development begins.

- ML