From f31ec69379a752e18321ce600a09db9de48fc263 Mon Sep 17 00:00:00 2001 From: Olaf Mandel Date: Fri, 21 Oct 2016 16:36:02 +0000 Subject: texi2html: Allow compiling out-of-source Compiling texi2html 5.0 out-of-source with USE_NLS set to no failed because it tried to copy from srcdir without using that variable. Fix this issue and add a reference to the upstream commit. (From OE-Core rev: 28a37020f50e513b247015b1b0a784c99d41aae3) Signed-off-by: Olaf Mandel Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- .../files/0001-Allow-compiling-out-of-source.patch | 39 ++++++++++++++++++++++ meta/recipes-extended/texi2html/texi2html_5.0.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch b/meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch new file mode 100644 index 0000000000..0cf025ff4a --- /dev/null +++ b/meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch @@ -0,0 +1,39 @@ +From: Olaf Mandel +Date: Fri, 21 Oct 2016 13:04:44 +0000 +Subject: [PATCH] Allow compiling out-of-source + +Upstream-Status: Backport of [svn://svn.sv.gnu.org/texinfo/trunk r3602] +--- + Makefile.am | 2 +- + Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 3447463..c9b5b5c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -208,7 +208,7 @@ i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot + done; \ + msgexec -i $< "$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" en > i18n/en.thl; \ + else \ +- cp -p i18n_ref/*.thl i18n; \ ++ cp -p "$(srcdir)/i18n_ref/"*.thl i18n; \ + fi + + i18n_ref: +diff --git a/Makefile.in b/Makefile.in +index 4264b37..a13f84d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1126,7 +1126,7 @@ i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot + done; \ + msgexec -i $< "$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" en > i18n/en.thl; \ + else \ +- cp -p i18n_ref/*.thl i18n; \ ++ cp -p "$(srcdir)/i18n_ref/"*.thl i18n; \ + fi + + i18n_ref: +-- +2.1.4 + diff --git a/meta/recipes-extended/texi2html/texi2html_5.0.bb b/meta/recipes-extended/texi2html/texi2html_5.0.bb index eac289e3b5..ae64816f82 100644 --- a/meta/recipes-extended/texi2html/texi2html_5.0.bb +++ b/meta/recipes-extended/texi2html/texi2html_5.0.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" PR = "r2" SRC_URI = "${SAVANNAH_GNU_MIRROR}/texi2html/${BPN}-${PV}.tar.bz2 \ + file://0001-Allow-compiling-out-of-source.patch \ " SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54" -- cgit 1.2.3-korg