see patch and commit: e42ded0 coreutils: fix musl compilation Signed-off-by: Nicola Lunghi <[email protected]> --- ...charset.alias-when-building-for-musl.patch | 38 +++++++++++++++++++ .../findutils/findutils_4.2.31.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 recipes-extended/findutils/findutils-4.2.31/build-don-t-need-charset.alias-when-building-for-musl.patch
diff --git a/recipes-extended/findutils/findutils-4.2.31/build-don-t-need-charset.alias-when-building-for-musl.patch b/recipes-extended/findutils/findutils-4.2.31/build-don-t-need-charset.alias-when-building-for-musl.patch new file mode 100644 index 0000000..cf25f28 --- /dev/null +++ b/recipes-extended/findutils/findutils-4.2.31/build-don-t-need-charset.alias-when-building-for-musl.patch @@ -0,0 +1,38 @@ +From d7178a76d066afdd487047574ffe840999201de8 Mon Sep 17 00:00:00 2001 +From: Nicola Lunghi <[email protected]> +Date: Mon, 3 Feb 2020 18:47:03 +0000 +Subject: [PATCH] build: don't need charset.alias when building for musl + +Upstream-Status: Inappropriate [required for findutils 4.2.31 (GPLv2) only] +Signed-off-by: Nicola Lunghi <[email protected]> +--- + gnulib/lib/Makefile.am | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am +index 90351b3..1b06b16 100644 +--- a/gnulib/lib/Makefile.am ++++ b/gnulib/lib/Makefile.am +@@ -471,7 +471,11 @@ all-local: charset.alias ref-add.sed ref-del.sed + charset_alias = $(DESTDIR)$(libdir)/charset.alias + charset_tmp = $(DESTDIR)$(libdir)/charset.tmp + install-exec-local: all-local +- test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) ++ case '$(host_os)' in \ ++ linux-musl*) \ ++ : ;;\ ++ *) \ ++ test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) ;\ + if test -f $(charset_alias); then \ + sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ + $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ +@@ -482,7 +486,8 @@ install-exec-local: all-local + $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ + rm -f $(charset_tmp) ; \ + fi ; \ +- fi ++ fi ;\ ++ esac + + uninstall-local: all-local + if test -f $(charset_alias); then \ diff --git a/recipes-extended/findutils/findutils_4.2.31.bb b/recipes-extended/findutils/findutils_4.2.31.bb index 7dee018..5fb1f65 100644 --- a/recipes-extended/findutils/findutils_4.2.31.bb +++ b/recipes-extended/findutils/findutils_4.2.31.bb @@ -8,6 +8,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://gnulib-extension.patch \ file://findutils_fix_for_automake-1.12.patch \ file://findutils-fix-doc-build-error.patch \ + file://build-don-t-need-charset.alias-when-building-for-musl.patch \ " SRC_URI[md5sum] = "a0e31a0f18a49709bf5a449867c8049a" -- 2.20.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#48260): https://lists.yoctoproject.org/g/yocto/message/48260 Mute This Topic: https://lists.yoctoproject.org/mt/70954384/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
