From e42ded0ee35d0aab0de8fa090eda9f1c08bcbb4c Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 19 Jun 2017 11:28:18 +0100 Subject: coreutils: fix musl compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As per the patch Signed-off-by: André Draszik Acked-by: Sylvain Lemieux Signed-off-by: Ross Burton --- ...-need-charset.alias-when-building-for-mus.patch | 44 ++++++++++++++++++++++ recipes-core/coreutils/coreutils_6.9.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch (limited to 'recipes-core') diff --git a/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch b/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch new file mode 100644 index 0000000..2e0bfb7 --- /dev/null +++ b/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch @@ -0,0 +1,44 @@ +From 542811eecc05c6c43590bde3852598aa6277abf3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Thu, 23 Mar 2017 12:46:07 +0000 +Subject: [PATCH] build: don't need charset.alias when building for musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [required for coreutils 6.9 (GPLv2) recipe only] +Signed-off-by: André Draszik +--- + lib/gnulib.mk | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/lib/gnulib.mk b/lib/gnulib.mk +index e833d14..04b2b74 100644 +--- a/lib/gnulib.mk ++++ b/lib/gnulib.mk +@@ -907,7 +907,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) ; \ +@@ -918,7 +922,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 \ +-- +2.11.0 + diff --git a/recipes-core/coreutils/coreutils_6.9.bb b/recipes-core/coreutils/coreutils_6.9.bb index 5c60048..31e5c7e 100644 --- a/recipes-core/coreutils/coreutils_6.9.bb +++ b/recipes-core/coreutils/coreutils_6.9.bb @@ -27,6 +27,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ file://fix_for_manpage_building.patch \ file://loadavg.patch \ file://no-man.patch \ + file://build-don-t-need-charset.alias-when-building-for-mus.patch \ " SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06" -- cgit v1.2.3-54-g00ecf