* [PATCH] texi2html: Allow compiling out-of-source
@ 2016-10-21 13:44 Olaf Mandel
2016-10-21 16:11 ` Christopher Larson
0 siblings, 1 reply; 3+ messages in thread
From: Olaf Mandel @ 2016-10-21 13:44 UTC (permalink / raw)
To: openembedded-core; +Cc: Olaf Mandel
Compiling texi2html 5.0 out-of-source with USE_NLS set to no failed
because it trieed to copy from srcdir without using that variable.
Fix this issue.
No need to send upstream: current trunk already contains this.
Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com>
---
.../files/0001-Allow-compiling-out-of-source.patch | 38 ++++++++++++++++++++++
meta/recipes-extended/texi2html/texi2html_5.0.bb | 1 +
2 files changed, 39 insertions(+)
create mode 100644 meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch
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 0000000..754f0a2
--- /dev/null
+++ b/meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch
@@ -0,0 +1,38 @@
+From: Olaf Mandel <o.mandel@menlosystems.com>
+Date: Fri, 21 Oct 2016 13:04:44 +0000
+Subject: [PATCH] Allow compiling out-of-source
+
+---
+ 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 eac289e..ae64816 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"
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] texi2html: Allow compiling out-of-source
2016-10-21 13:44 [PATCH] texi2html: Allow compiling out-of-source Olaf Mandel
@ 2016-10-21 16:11 ` Christopher Larson
2016-10-21 16:36 ` [PATCH v2] " Olaf Mandel
0 siblings, 1 reply; 3+ messages in thread
From: Christopher Larson @ 2016-10-21 16:11 UTC (permalink / raw)
To: Olaf Mandel; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
On Fri, Oct 21, 2016 at 6:44 AM, Olaf Mandel <o.mandel@menlosystems.com>
wrote:
> Compiling texi2html 5.0 out-of-source with USE_NLS set to no failed
> because it trieed to copy from srcdir without using that variable.
> Fix this issue.
>
> No need to send upstream: current trunk already contains this.
>
> Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com>
>
Missing Upstream-Status in the patch file.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1078 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2] texi2html: Allow compiling out-of-source
2016-10-21 16:11 ` Christopher Larson
@ 2016-10-21 16:36 ` Olaf Mandel
0 siblings, 0 replies; 3+ messages in thread
From: Olaf Mandel @ 2016-10-21 16:36 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson, Olaf Mandel
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.
Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com>
---
.../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
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 0000000..0cf025f
--- /dev/null
+++ b/meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch
@@ -0,0 +1,39 @@
+From: Olaf Mandel <o.mandel@menlosystems.com>
+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 eac289e..ae64816 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"
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-21 16:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-21 13:44 [PATCH] texi2html: Allow compiling out-of-source Olaf Mandel
2016-10-21 16:11 ` Christopher Larson
2016-10-21 16:36 ` [PATCH v2] " Olaf Mandel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.