Patchwork [meta-gnome] gnumeric: Fix build failure with newer autotools

login
register
mail settings
Submitter Khem Raj
Date Oct. 18, 2013, 4 a.m.
Message ID <1382068814-12984-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/60183/
State Accepted, archived
Commit ddeb0fe9186a0a7d101221d6db32bcdcd09e5a10
Headers show

Comments

Khem Raj - Oct. 18, 2013, 4 a.m.
Backports from upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../gnumeric/gnumeric/do-not-use-srcdir.patch             | 15 +++++++++++++++
 meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb      |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch

Patch

diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch b/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch
new file mode 100644
index 0000000..cc81b1f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch
@@ -0,0 +1,15 @@ 
+Index: gnumeric-1.12.0/test/Makefile.am
+===================================================================
+--- gnumeric-1.12.0.orig/test/Makefile.am	2011-05-17 17:54:24.000000000 -0700
++++ gnumeric-1.12.0/test/Makefile.am	2013-10-17 20:28:19.920618596 -0700
+@@ -25,7 +25,9 @@
+ #
+ # 90xx: Misc stuff.
+ 
+-TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl))
++TESTS_EXTENSIONS=.pl
++TESTS = @auto_find_tests@
++
+ SUPPS = common.supp commondots.supp gui.supp t8003-valgrind-pdf.supp
+ 
+ import-db:
diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
index 4f40594..041ab3f 100644
--- a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
+++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
@@ -7,10 +7,13 @@  DESCRIPTION = "Gnumeric spreadsheet for GNOME"
 
 GNOME_COMPRESS_TYPE = "xz"
 
+inherit gnome
+
+SRC_URI += "file://do-not-use-srcdir.patch"
+
 SRC_URI[archive.md5sum] = "3fd87cca95334b5d8ac922989670fe27"
 SRC_URI[archive.sha256sum] = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111"
 
-inherit gnome
 
 EXTRA_OECONF=" --without-perl "