diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2013-10-18 00:08:03 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-21 12:15:03 +0200 |
| commit | f5e107e99f16097ed46e397fdd3d7ca38df64a43 (patch) | |
| tree | 53950443ac1e724ebb28f6ef65a13ce9adec8a47 /meta-gnome/recipes-gnome | |
| parent | 51a3367e88224a3f50a792010c63d446f5bec220 (diff) | |
| download | meta-openembedded-contrib-f5e107e99f16097ed46e397fdd3d7ca38df64a43.tar.gz | |
libbonobo: Fix build error with new autotools
Don't use srcdir with tests
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/bonobo/libbonobo/do-not-use-srcdir-variable.patch | 24 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb | 4 |
2 files changed, 27 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch new file mode 100644 index 0000000000..46f81370f1 --- /dev/null +++ b/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch @@ -0,0 +1,24 @@ +| tests/Makefile.am:55: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/te +st-properties.sh' +| tests/test-activation/Makefile.am:76: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS +' (or '*_CPPFLAGS') +| utils/Makefile.am:9: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS +') +| autoreconf: automake failed with exit status: 1 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Not Submitted + +Index: libbonobo-2.24.3/tests/Makefile.am +=================================================================== +--- libbonobo-2.24.3.orig/tests/Makefile.am 2009-04-18 05:27:41.000000000 -0700 ++++ libbonobo-2.24.3/tests/Makefile.am 2013-10-17 16:59:45.612989079 -0700 +@@ -53,7 +53,7 @@ + MODELS_DIR="$(srcdir)/models" + + TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \ +- test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \ ++ test-stream-mem$(EXEEXT) test-properties.sh test-storage-mem$(EXEEXT) \ + test-generic-factory.sh test-main-loop$(EXEEXT) + check_SCRIPTS = test-properties.sh test-generic-factory.sh + EXTRA_DIST=$(check_SCRIPTS) Test_Generic_Factory.server diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb index 622f244f89..b837802fca 100644 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb +++ b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb @@ -1,6 +1,8 @@ require libbonobo.inc PR = "r2" -SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch" +SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \ + file://do-not-use-srcdir-variable.patch \ + " SRC_URI[archive.md5sum] = "b217cef6a187505290c66c5bf8225d38" SRC_URI[archive.sha256sum] = "5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe" |