diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2013-10-15 02:03:13 +0200 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2013-10-17 14:14:13 +0200 |
| commit | 31fbc96e2f351329229ffc59e892c0f2d8ce8e5b (patch) | |
| tree | 8f9ae38bf49d5569d34ff729ca42fb7fa2a0c11f /meta-gnome | |
| parent | f8903f53db717294d63a8d79b5ef7ca34b3c189e (diff) | |
| download | meta-openembedded-contrib-31fbc96e2f351329229ffc59e892c0f2d8ce8e5b.tar.gz | |
orbit2: fix build after automake 1.13.4 update
fixes:
| test/everything/Makefile.am:81: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/test.sh'
| test/inhibit/Makefile.am:4: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
| test/poa/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
| WARNING: /home/superandy/tmp/oe-core-eglibc/work/x86_64-linux/orbit2-native/2.14.19-r0/temp/run.do_configure.14800:1 exit 1 from
| exit 1
| ERROR: Function failed: do_configure (log file is located at /home/superandy/tmp/oe-core-eglibc/work/x86_64-linux/orbit2-native/2.14.19-r0/temp/log.do_configure.14800)
ERROR: Task 6208 (virtual:native:/home/superandy/data/oe-core/sources/meta-openembedded/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb, do_configure) failed with exit code '1'
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch | 42 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch new file mode 100644 index 0000000000..7993abb92c --- /dev/null +++ b/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch @@ -0,0 +1,42 @@ +From d91dbb42dc3b6073720027f68827acd0abee6d75 Mon Sep 17 00:00:00 2001 +From: Kjartan Maraas <kmaraas@gnome.org> +Date: Tue, 14 May 2013 13:29:53 +0200 +Subject: [PATCH] Use AM_CPPFLAGS instead of INCLUDES and fix problem using +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport [1] + +[1] https://git.gnome.org/browse/ORBit2/commit/test/everything/Makefile.am?id=d91dbb42dc3b6073720027f68827acd0abee6d75 + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + test/everything/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am +index 32beb36..cb4b1d6 100644 +--- a/test/everything/Makefile.am ++++ b/test/everything/Makefile.am +@@ -10,7 +10,7 @@ EVERYTHING_IDLOUT = \ + $(EVERYTHING_BUILT) \ + everything-imodule.c + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_builddir)/src \ +@@ -78,7 +78,7 @@ include $(top_srcdir)/Makefile.shared + BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c + CLEANFILES = ${BUILT_SOURCES} iorfile + +-TESTS = $(srcdir)/test.sh ++TESTS = $(top_builddir)/test/everything/test.sh + + EXTRA_DIST = $(IDL_FILES) test.sh $(included_src) + +-- +1.8.3.1 + diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb index 74b6c122c8..ba3982df15 100644 --- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb +++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb @@ -9,6 +9,7 @@ SRC_URI = " \ file://configure-lossage.patch \ file://pkgconfig-fix.patch \ file://0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch \ + file://0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch \ " SRC_URI[md5sum] = "7082d317a9573ab338302243082d10d1" SRC_URI[sha256sum] = "55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550" |