Skip to contentSkip to conversation

Automake-1.13 fixes

PATCH In review Marko Lindqvist 2 participants 7 messages Aug 20, 2013 – Aug 21, 2013

lore
Share & tools
lore

Marko Lindqvist

author
#0 lore raw

cover Automake-1.13 fixes

The following changes since commit fd9e591f266e1a6c183e77f24e50d31e0d52bdd5:

cronie: fix out of tree build (2013-08-19 11:24:51 +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):
texinfo: correct dont-depend-on-help2man.patch
gtk-engines: fix build with automake-1.13

 .../texinfo-5.1/dont-depend-on-help2man.patch      |   43 +++++++++++++++++---
 .../gtk-engines-2.20.2/substitute-tests.patch      |   37 +++++++++++++++++
 .../gtk-engines/gtk-engines_2.20.2.bb              |    5 +--
 3 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch
Signature · 1 line
1.7.10.4
author
#2 lore raw
Quoted 8 lines · Ross
Quoted 7 lines · Marko Lindqvist

The following changes since commit fd9e591f266e1a6c183e77f24e50d31e0d52bdd5:

cronie: fix out of tree build (2013-08-19 11:24:51 +0100)

are available in the git repository at:

Quoted 7 lines
Quoted 2 lines

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

Are you deliberately just sending the cover letter, or is my mailer being strange?

Ross

I've sent cover letter only.

- ML

#3 lore raw
Quoted 4 lines
Quoted 2 lines

Are you deliberately just sending the cover letter, or is my mailer being strange?

I've sent cover letter only.

For review purposes I much prefer patches in mails, can you send the full series?

Ross

author
#4 lore raw

PATCH 1/2 texinfo: correct dont-depend-on-help2man.patch

In reply to Marko Lindqvist

Patch needed only with automake-1.13 no longer worked as expected after texinfo has been updated to version 5.1.

Signed-off-by Marko Lindqvist <[email protected]>
---
 .../texinfo-5.1/dont-depend-on-help2man.patch      |   43 +++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)
meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch +38 -5
index 7502328..6e216da 100644
@@ -1,11 +1,10 @@
 Upstream-Status: Inappropŕiate
 
 Signed-off-by: Marko Lindqvist <[email protected]>
-Index: texinfo-5.1/doc/Makefile.am
-===================================================================
---- texinfo-5.1.orig/doc/Makefile.am
-+++ texinfo-5.1/doc/Makefile.am
-@@ -40,7 +40,7 @@ refcard_files = refcard/Makefile refcard
+diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am
+--- texinfo-5.1/doc/Makefile.am	2013-02-23 02:11:25.000000000 +0200
++++ texinfo-5.1/doc/Makefile.am	2013-08-20 01:43:55.622376198 +0300
+@@ -40,7 +40,7 @@
  # Include our texinfo.tex, not Automake's.
  EXTRA_DIST = epsf.tex texinfo.tex \
               fdl.texi \

@@ -14,3 +13,37 @@ Index: texinfo-5.1/doc/Makefile.am
  	     $(refcard_files)
  
  if INSTALL_WARNINGS
+diff -Nurd texinfo-5.1/man/Makefile.am texinfo-5.1/man/Makefile.am
+--- texinfo-5.1/man/Makefile.am	2013-02-23 02:11:25.000000000 +0200
++++ texinfo-5.1/man/Makefile.am	2013-08-20 01:53:40.542395884 +0300
+@@ -13,24 +13,24 @@
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ # These are generated using help2man.
+-man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
++#man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
+
+ # These require the build in info/, thus can't do if we failed to find a
+ # terminal library.
+ if HAVE_TERMLIBS
+-man_MANS += info.1 infokey.1
++#man_MANS += info.1 infokey.1
+ endif
+
+ # These are hand-written.
+-man_MANS += info.5 texinfo.5
++#man_MANS += info.5 texinfo.5
+
+ # This is generated by pod2man, but let's just run it by hand.
+-man_MANS += pod2texi.1
++#man_MANS += pod2texi.1
+
+ # These are just .so's to the common program.
+-man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
++#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
+
+-EXTRA_DIST = $(man_MANS) ginfo.h2m
++EXTRA_DIST = ginfo.h2m
+
+ # Maintainers should be able to regenerate.
+ MAINTAINERCLEANFILES = $(man_MANS)
Signature · 1 line
1.7.10.4
author
#5 lore raw

PATCH 2/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              |    5 ++-
 2 files changed, 39 insertions(+), 3 deletions(-)
 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 -3
index 32d7be4..401e76c 100644
@@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 SECTION = "x11/base"
 DEPENDS = "gtk+"
 
-PR = "r3"
-
 PACKAGES_DYNAMIC += "^gtk-engine-.* ^gtk-theme-.*"
 
 RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"

@@ -37,6 +35,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
#6 lore raw

Re: [PATCH 2/2] gtk-engines: fix build with automake-1.13

meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" · line 12

Quoted 2 lines · Marko Lindqvist
meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +0 -2
-PR = "r3"
-

Don't remove this PR value.

Ross