diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-04-15 19:00:25 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-21 07:19:05 +0100 |
| commit | fbe6d2c12aa9f7956bc87efeb68cb64b26b60c7a (patch) | |
| tree | 4b1a784d3ca6cdf50c9e8fe7eb7e19150666b71f /meta/recipes-extended/texinfo | |
| parent | 1a9d92b9891c06ede91af05d516a429e1f81777d (diff) | |
| download | openembedded-core-fbe6d2c12aa9f7956bc87efeb68cb64b26b60c7a.tar.gz | |
recipes: Fix charset.alias for musl
This is same gnulib fix replicated across needed recipes
Change-Id: I756713407111a726eae98e26c9c1ff64981371c0
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/texinfo')
| -rw-r--r-- | meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-extended/texinfo/texinfo_5.2.bb | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..6ea6380c55 --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch @@ -0,0 +1,30 @@ +From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 13 Apr 2015 17:02:13 -0700 +Subject: [PATCH] Unset need_charset_alias when building for musl + +localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 +which actually shoudl be fixed in gnulib and then all downstream +projects will get it eventually. For now we apply the fix to +coreutils + +Upstream-Status: Not Required + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/gnulib.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: texinfo-5.2/gnulib/lib/Makefile.am +=================================================================== +--- texinfo-5.2.orig/gnulib/lib/Makefile.am ++++ texinfo-5.2/gnulib/lib/Makefile.am +@@ -378,7 +378,7 @@ install-exec-localcharset: all-local + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ diff --git a/meta/recipes-extended/texinfo/texinfo_5.2.bb b/meta/recipes-extended/texinfo/texinfo_5.2.bb index 8dbcaa14f4..aa644e1206 100644 --- a/meta/recipes-extended/texinfo/texinfo_5.2.bb +++ b/meta/recipes-extended/texinfo/texinfo_5.2.bb @@ -34,6 +34,7 @@ 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-Unset-need_charset_alias-when-building-for-musl.patch \ ${TARGET_PATCH} \ " @@ -58,7 +59,7 @@ do_compile_prepend() { do_install_append() { mkdir -p ${D}${datadir}/${tex_texinfo} - install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} + install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/texi2any ${D}${bindir}/pod2texi } |