From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 18 Oct 2013 00:08:03 +0000 (+0000)
Subject: libbonobo: Fix build error with new autotools
X-Git-Tag: rev_ivi_2015_02_04~2640
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f5c2729c578c3f250cf29dae27928018f43c2a5d;p=scm%2Fbb%2Ftizen-distro.git

libbonobo: Fix build error with new autotools

Don't use srcdir with tests

(From meta-openembedded rev: f5e107e99f16097ed46e397fdd3d7ca38df64a43)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---

diff --git a/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch b/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch
new file mode 100644
index 0000000..46f8137
--- /dev/null
+++ b/meta-openembedded/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-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb
index 622f244..b837802 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb
+++ b/meta-openembedded/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"