aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zimmermann <ml@vdm-design.de>2011-01-14 23:45:53 +0100
committerThomas Zimmermann <ml@vdm-design.de>2011-01-14 23:45:53 +0100
commitc6daf0c9c3f5050bd31daf30e7eb2d9eecc8cf50 (patch)
tree97b4cc675be46a514716edc5f0f4ea24a53317c6
parentea9751831e088dc1cacbfe6aad2461b52ea6f434 (diff)
downloadopenembedded-c6daf0c9c3f5050bd31daf30e7eb2d9eecc8cf50.tar.gz
dbus-c++: add patch to fix the Makefile
* dbus-c++ stages the header files in dbus-c++-1/dbus-c++ but includes in the autogenerated files just dbus-c++ Signed-off-by: Thomas Zimmermann <ml@vdm-design.de>
-rw-r--r--recipes/dbus/dbus-c++/fix-Makefile.patch11
-rw-r--r--recipes/dbus/dbus-c++_git.bb4
2 files changed, 14 insertions, 1 deletions
diff --git a/recipes/dbus/dbus-c++/fix-Makefile.patch b/recipes/dbus/dbus-c++/fix-Makefile.patch
new file mode 100644
index 0000000000..0724f323d6
--- /dev/null
+++ b/recipes/dbus/dbus-c++/fix-Makefile.patch
@@ -0,0 +1,11 @@
+--- git/src/Makefile.am 2011-01-14 23:36:44.000000000 +0100
++++ git/src/Makefile.am 2011-01-14 23:36:44.000000000 +0100
+@@ -39,7 +39,7 @@
+ $(HEADER_DIR)/pipe.h \
+ $(GLIB_H) $(ECORE_H)
+
+-lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
++lib_includedir=$(includedir)/dbus-c++/
+ lib_include_HEADERS = $(HEADER_FILES)
+
+ lib_LTLIBRARIES = libdbus-c++-1.la
diff --git a/recipes/dbus/dbus-c++_git.bb b/recipes/dbus/dbus-c++_git.bb
index 07b4eece56..246a631406 100644
--- a/recipes/dbus/dbus-c++_git.bb
+++ b/recipes/dbus/dbus-c++_git.bb
@@ -6,8 +6,10 @@ SRCREV = "9e25833870ed8281fab00d7f9eac5755c6798c57"
PE = "1"
PV = "0.6.0-pre1+gitr${SRCPV}"
+PR = "r1"
-SRC_URI = "git://gitorious.org/dbus-cplusplus/mainline.git;protocol=git"
+SRC_URI = "git://gitorious.org/dbus-cplusplus/mainline.git;protocol=git \
+ file://fix-Makefile.patch"
S = "${WORKDIR}/git"