diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-05 16:50:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-09 11:56:41 +0000 |
commit | b234a4ed4d6a9c2e00f5fa38cf04867c7ada24a0 (patch) | |
tree | a373cd9e3467350528e23403e4fe406b205f0e87 /meta/recipes-extended/texinfo/texinfo/link-zip.patch | |
parent | 3cce2d1c36b0859186139d650fd50d2a56e91abd (diff) | |
download | openembedded-core-contrib-b234a4ed4d6a9c2e00f5fa38cf04867c7ada24a0.tar.gz |
texinfo: update to 6.7
Drop 0001-Unset-need_charset_alias-when-building-for-musl.patch
as the problematic code is gone.
Rebase the other patches.
License-Update: http links changed to https
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/texinfo/texinfo/link-zip.patch')
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo/link-zip.patch | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo/link-zip.patch b/meta/recipes-extended/texinfo/texinfo/link-zip.patch index 0b6e9fd7ea..15c030c0c6 100644 --- a/meta/recipes-extended/texinfo/texinfo/link-zip.patch +++ b/meta/recipes-extended/texinfo/texinfo/link-zip.patch @@ -1,16 +1,23 @@ -install-info uses symbols from zlib so must link against it. +From c1002138033fcccb2d1abfc41f5c2e46c836f7a0 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> -Index: texinfo-5.1/install-info/Makefile.am -=================================================================== ---- texinfo-5.1.orig/install-info/Makefile.am -+++ texinfo-5.1/install-info/Makefile.am -@@ -34,4 +34,4 @@ AM_CPPFLAGS = \ +--- + 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) -+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz +-LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) ++LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) -lz |