summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorOlaf Mandel <o.mandel@menlosystems.com>2016-10-21 16:36:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-06 23:35:34 +0000
commit7253860e2117738304cd72bdff6e85e6b18883da (patch)
tree1fd90148bdbc16d2126c73dc046b6c3f7b335d1c /meta/recipes-extended
parent6c1a2458040dfce0fafa008c304671ea6404f61f (diff)
downloadpoky-7253860e2117738304cd72bdff6e85e6b18883da.tar.gz
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 <o.mandel@menlosystems.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch39
-rw-r--r--meta/recipes-extended/texi2html/texi2html_5.0.bb1
2 files changed, 40 insertions, 0 deletions
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 @@
1From: Olaf Mandel <o.mandel@menlosystems.com>
2Date: Fri, 21 Oct 2016 13:04:44 +0000
3Subject: [PATCH] Allow compiling out-of-source
4
5Upstream-Status: Backport of [svn://svn.sv.gnu.org/texinfo/trunk r3602]
6---
7 Makefile.am | 2 +-
8 Makefile.in | 2 +-
9 2 files changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/Makefile.am b/Makefile.am
12index 3447463..c9b5b5c 100644
13--- a/Makefile.am
14+++ b/Makefile.am
15@@ -208,7 +208,7 @@ i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
16 done; \
17 msgexec -i $< "$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" en > i18n/en.thl; \
18 else \
19- cp -p i18n_ref/*.thl i18n; \
20+ cp -p "$(srcdir)/i18n_ref/"*.thl i18n; \
21 fi
22
23 i18n_ref:
24diff --git a/Makefile.in b/Makefile.in
25index 4264b37..a13f84d 100644
26--- a/Makefile.in
27+++ b/Makefile.in
28@@ -1126,7 +1126,7 @@ i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
29 done; \
30 msgexec -i $< "$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" en > i18n/en.thl; \
31 else \
32- cp -p i18n_ref/*.thl i18n; \
33+ cp -p "$(srcdir)/i18n_ref/"*.thl i18n; \
34 fi
35
36 i18n_ref:
37--
382.1.4
39
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"
7PR = "r2" 7PR = "r2"
8 8
9SRC_URI = "${SAVANNAH_GNU_MIRROR}/texi2html/${BPN}-${PV}.tar.bz2 \ 9SRC_URI = "${SAVANNAH_GNU_MIRROR}/texi2html/${BPN}-${PV}.tar.bz2 \
10 file://0001-Allow-compiling-out-of-source.patch \
10 " 11 "
11 12
12SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54" 13SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54"