diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-10-18 04:00:14 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-21 12:15:03 +0200 |
commit | ddeb0fe9186a0a7d101221d6db32bcdcd09e5a10 (patch) | |
tree | 12255f8c75956154591d06d11560d14a53e3e15d /meta-gnome/recipes-gnome | |
parent | 17872764a5cfc402b0b33a1ac9e6d3f9e2e827da (diff) | |
download | meta-openembedded-ddeb0fe9186a0a7d101221d6db32bcdcd09e5a10.tar.gz |
gnumeric: Fix build failure with newer autotools
Backports from upstream
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch | 15 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb | 5 |
2 files changed, 19 insertions, 1 deletions
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 000000000..cc81b1fc0 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Index: gnumeric-1.12.0/test/Makefile.am | ||
2 | =================================================================== | ||
3 | --- gnumeric-1.12.0.orig/test/Makefile.am 2011-05-17 17:54:24.000000000 -0700 | ||
4 | +++ gnumeric-1.12.0/test/Makefile.am 2013-10-17 20:28:19.920618596 -0700 | ||
5 | @@ -25,7 +25,9 @@ | ||
6 | # | ||
7 | # 90xx: Misc stuff. | ||
8 | |||
9 | -TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl)) | ||
10 | +TESTS_EXTENSIONS=.pl | ||
11 | +TESTS = @auto_find_tests@ | ||
12 | + | ||
13 | SUPPS = common.supp commondots.supp gui.supp t8003-valgrind-pdf.supp | ||
14 | |||
15 | 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 4f4059412..041ab3fbd 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" | |||
7 | 7 | ||
8 | GNOME_COMPRESS_TYPE = "xz" | 8 | GNOME_COMPRESS_TYPE = "xz" |
9 | 9 | ||
10 | inherit gnome | ||
11 | |||
12 | SRC_URI += "file://do-not-use-srcdir.patch" | ||
13 | |||
10 | SRC_URI[archive.md5sum] = "3fd87cca95334b5d8ac922989670fe27" | 14 | SRC_URI[archive.md5sum] = "3fd87cca95334b5d8ac922989670fe27" |
11 | SRC_URI[archive.sha256sum] = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111" | 15 | SRC_URI[archive.sha256sum] = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111" |
12 | 16 | ||
13 | inherit gnome | ||
14 | 17 | ||
15 | EXTRA_OECONF=" --without-perl " | 18 | EXTRA_OECONF=" --without-perl " |
16 | 19 | ||