vala-terminal: patch Makefile.am for B!=S
PATCH 2/2 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 <[email protected]>
Signed-off-by Steve Arnold <[email protected]>
--- .../files/automake-separate-build.patch | 25 ++++++++++++++++++++++ .../vala-terminal/vala-terminal_git.bb | 7 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-support/vala-terminal/files/automake-separate-build.patch
meta-oe/recipes-support/vala-terminal/files/automake-separate-build.patch new file +25 -0
@@ -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
meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb +4 -3
@@ -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"
Signature · 1 line
2.0.4