mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

texinfo: update 7.0.3 -> 7.1

Browse Source 
Drop texinfo/link-zip.patch
(no longer necessary)

Add texinfo_cv_sys_iconv_converts_euc_cn=yes as otherwise
it's determined via building and running a helper binary.

(From OE-Core rev: eb13b936347b01dd92190713439e0ced6329337d)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-03-13 18:33:34 +01:00
committed by Richard Purdie
parent bdd51994e1
commit 0a60440ceb
5 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch → meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch
View File

@@ -1,7 +1,8 @@
From e5d8f6d4a7652ea95c8d069ce9333494f2db868c Mon Sep 17 00:00:00 2001
From ee9d23373b488c4a499c561d71e6b6ba7ca1bd31 Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Fri, 16 Sep 2011 15:35:48 -0700
Subject: [PATCH] texinfo: several changes to build without zlib and ncurses
Subject: [PATCH 1/3] texinfo: several changes to build without zlib and
ncurses
We already DEPEND on the native texinfo being present before building so
there isn't any need to try and build the required native texinfo binaries
@@ -10,16 +11,15 @@ before cross-compiling. This simplifies the recipe somewhat!
Upstream-Status: Inappropriate oe specific
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
configure.ac | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6fcd3a0..c108df7 100644
index 8094498..5b72fc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,29 +180,7 @@ AC_CANONICAL_BUILD
@@ -247,29 +247,7 @@ AC_CANONICAL_BUILD
# $native_tools is also added to SUBDIRS in the main Makefile.am,
# so that make compiles the native tools first.
#
@@ -50,3 +50,6 @@ index 6fcd3a0..c108df7 100644
AC_SUBST(native_tools)
AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
--
2.39.2

16
meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch → meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch
View File

@@ -1,33 +1,32 @@
From 451a9b9c3874872d575693fc7733fae02690a7d3 Mon Sep 17 00:00:00 2001
From e02be81fa68ddc7f939abd99de4e42759a0d5d8c Mon Sep 17 00:00:00 2001
From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
Date: Tue, 29 Nov 2016 13:43:24 -0600
Subject: [PATCH] dont-depend-on-help2man
Subject: [PATCH 2/3] dont-depend-on-help2man
Upstream-Status: Inappropriate
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
---
doc/Makefile.am | 2 +-
man/Makefile.am | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 407a38c..6b5ff3e 100644
index e9e6298..f1b9895 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -55,7 +55,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \
@@ -63,7 +63,7 @@ refcard/txirefcard.pdf refcard/txirefcard-a4.pdf: refcard/txirefcard.tex
# Include our texinfo.tex, not Automake's.
EXTRA_DIST = epsf.tex texinfo.tex \
fdl.texi \
- $(man_MANS) $(TXI_XLATE) \
+ $(TXI_XLATE) \
$(refcard_files) \
gendocs.chapter/gendocs_template \
texinfo-tex-test.texi texinfo-tex-test.WIDOWs \
texinfo-ja.tex short-sample-ja.texi \
diff --git a/man/Makefile.am b/man/Makefile.am
index d0cd72c..a19e52a 100644
index f2c703f..61caeeb 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -11,27 +11,27 @@
@@ -64,3 +63,6 @@ index d0cd72c..a19e52a 100644
# Maintainers should be able to regenerate.
MAINTAINERCLEANFILES = $(man_MANS)
--
2.39.2

12
meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch → meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch
View File

@@ -1,21 +1,20 @@
From 81ccd162b869c20e450073fa834b5cabbea8e3d4 Mon Sep 17 00:00:00 2001
From 33b85a3928895b812b37dc759c6de711802db45f Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Mon, 29 Jul 2013 15:02:34 -0700
Subject: [PATCH] texinfo: Update to 5.1
Subject: [PATCH 3/3] texinfo: Update to 5.1
Upstream-Status: Inappropriate [cross build specific]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
info/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/info/Makefile.am b/info/Makefile.am
index 35596b1..cae1421 100644
index f57b341..a019aa7 100644
--- a/info/Makefile.am
+++ b/info/Makefile.am
@@ -69,7 +69,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
@@ -77,7 +77,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
# more than once.
funs.h: makedoc$(EXEEXT) $(cmd_sources)
rm -f $(generated_sources)
@@ -24,3 +23,6 @@ index 35596b1..cae1421 100644
# The following hack is necessary to hint make before the automatic
# dependencies are built.
--
2.39.2

23
meta/recipes-extended/texinfo/texinfo/link-zip.patch
View File

@@ -1,23 +0,0 @@
From c5050ac84c8a3cc3ff8c7e558f8c2fdb57f410d9 Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Mon, 29 Jul 2013 15:02:34 -0700
Subject: [PATCH] install-info uses symbols from zlib so must link against it.
Upstream-Status: Pending
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
install-info/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install-info/Makefile.am b/install-info/Makefile.am
index 9bcff71..68247f9 100644
--- a/install-info/Makefile.am
+++ b/install-info/Makefile.am
@@ -33,4 +33,4 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/gnulib/lib \
-I$(top_builddir)/gnulib/lib \
-DLOCALEDIR=\"$(localedir)\"
-LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD)
+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) -lz

10
meta/recipes-extended/texinfo/texinfo_7.0.3.bb → meta/recipes-extended/texinfo/texinfo_7.1.bb
View File

@@ -25,17 +25,16 @@ RDEPENDS:info += "${@compress_pkg(d)}"
DEPENDS = "zlib ncurses texinfo-replacement-native"
DEPENDS:class-native = "zlib-native ncurses-native"
TARGET_PATCH = "file://use_host_makedoc.patch"
TARGET_PATCH = "file://0003-texinfo-Update-to-5.1.patch"
TARGET_PATCH:class-native = ""
SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
file://disable-native-tools.patch \
file://link-zip.patch \
file://dont-depend-on-help2man.patch \
file://0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch \
file://0002-dont-depend-on-help2man.patch \
${TARGET_PATCH} \
"
SRC_URI[sha256sum] = "3cc5706fb086b895e1dc2b407aade9f95a3a233ff856273e2b659b089f117683"
SRC_URI[sha256sum] = "dd5710b3a53ac002644677a06145748e260592a35be182dc830ebebb79c5d5a0"
tex_texinfo = "texmf/tex/texinfo"
@@ -44,6 +43,7 @@ inherit gettext autotools multilib_script
MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any"
EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
CACHED_CONFIGUREVARS += "texinfo_cv_sys_iconv_converts_euc_cn=yes"
do_configure:prepend () {
# autotools_do_configure updates po/Makefile.in.in, we also need