[oe-commits] stephen.arnold42 : vala-terminal: patch Makefile.am for B!=S

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 876950013051baea42cf5cbb29519f749fccf022
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=876950013051baea42cf5cbb29519f749fccf022

Author: stephen.arnold42 <stephen.arnold42 at gmail.com>
Date:   Fri Sep 12 18:15:55 2014 -0700

vala-terminal: patch Makefile.am for B!=S

vala-terminal was blacklisted because it failed to compile with
separate source and build dirs; patch Makefile.am to fix that by
adding missing $(srcdir) prefixes

Upstream-Status: Pending

Signed-off-by: S. Lockwood-Childs <sjl at vctlabs.com>
Signed-off-by: Steve Arnold <stephen.arnold42 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../files/automake-separate-build.patch            | 25 ++++++++++++++++++++++
 .../vala-terminal/vala-terminal_git.bb             |  7 +++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/vala-terminal/files/automake-separate-build.patch b/meta-oe/recipes-support/vala-terminal/files/automake-separate-build.patch
new file mode 100644
index 0000000..3ecdee8
--- /dev/null
+++ b/meta-oe/recipes-support/vala-terminal/files/automake-separate-build.patch
@@ -0,0 +1,25 @@
+--- src/Makefile.am.orig	2014-08-30 11:49:01.893118629 -0700
++++ src/Makefile.am	2014-08-30 11:49:09.201116496 -0700
+@@ -12,13 +12,13 @@
+ 	-include $(CONFIG_HEADER) \
+ 	$(NULL)
+ 
+-BUILT_SOURCES = src/.stamp
++BUILT_SOURCES = $(srcdir)/src/.stamp
+ 
+ bin_PROGRAMS = vala-terminal
+ 
+ vala_terminal_VALASOURCES = \
+-	src/terminal.vala \
+-	src/mainwindow.vala \
++	$(srcdir)/src/terminal.vala \
++	$(srcdir)/src/mainwindow.vala \
+ 	$(NULL)
+ 
+ vala_terminal_SOURCES = \
+@@ -54,4 +54,4 @@
+                        intltool-extract \
+                        intltool-merge \
+                        intltool-update \
+-                       mkinstalldirs src/*.c
++                       mkinstalldirs $(srcdir)/src/*.c
diff --git a/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb b/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb
index 78af9b6..de4d5ee 100644
--- a/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb
+++ b/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb
@@ -8,12 +8,13 @@ PV = "1.3+gitr${SRCPV}"
 PE = "1"
 PR = "r1"
 
-PNBLACKLIST[vala-terminal] = "BROKEN: Doesn't work with B!=S, touch: cannot touch `src/.stamp': No such file or directory"
 
 inherit autotools perlnative vala
 
-SRC_URI = "${FREESMARTPHONE_GIT}/vala-terminal.git;branch=master"
-S = "${WORKDIR}/git"
+SRC_URI = "${FREESMARTPHONE_GIT}/vala-terminal.git;branch=master \
+           file://automake-separate-build.patch \
+          "
+S = "${WORKDIR}/git" 
 
 RDEPENDS_${PN} = "ttf-liberation-mono"
 RREPLACES_${PN} = "openmoko-terminal2"