summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorAndré Draszik <adraszik@tycoint.com>2017-06-19 11:28:18 +0100
committerRoss Burton <ross.burton@intel.com>2017-06-22 13:38:53 +0100
commite42ded0ee35d0aab0de8fa090eda9f1c08bcbb4c (patch)
tree4873b09da46b576a76fc049df863f6c4f41aa70b /recipes-core
parentd1ab8b5b8d106d380f27e9157c94ec8ae2c6da30 (diff)
downloadmeta-gplv2-e42ded0ee35d0aab0de8fa090eda9f1c08bcbb4c.tar.gz
coreutils: fix musl compilation
As per the patch Signed-off-by: André Draszik <adraszik@tycoint.com> Acked-by: Sylvain Lemieux <slemieux@tycoint.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch44
-rw-r--r--recipes-core/coreutils/coreutils_6.9.bb1
2 files changed, 45 insertions, 0 deletions
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 @@
1From 542811eecc05c6c43590bde3852598aa6277abf3 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com>
3Date: Thu, 23 Mar 2017 12:46:07 +0000
4Subject: [PATCH] build: don't need charset.alias when building for musl
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Inappropriate [required for coreutils 6.9 (GPLv2) recipe only]
10Signed-off-by: André Draszik <adraszik@tycoint.com>
11---
12 lib/gnulib.mk | 9 +++++++--
13 1 file changed, 7 insertions(+), 2 deletions(-)
14
15diff --git a/lib/gnulib.mk b/lib/gnulib.mk
16index e833d14..04b2b74 100644
17--- a/lib/gnulib.mk
18+++ b/lib/gnulib.mk
19@@ -907,7 +907,11 @@ all-local: charset.alias ref-add.sed ref-del.sed
20 charset_alias = $(DESTDIR)$(libdir)/charset.alias
21 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
22 install-exec-local: all-local
23- test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
24+ case '$(host_os)' in \
25+ linux-musl*) \
26+ : ;;\
27+ *) \
28+ test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) ;\
29 if test -f $(charset_alias); then \
30 sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
31 $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
32@@ -918,7 +922,8 @@ install-exec-local: all-local
33 $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
34 rm -f $(charset_tmp) ; \
35 fi ; \
36- fi
37+ fi ;\
38+ esac
39
40 uninstall-local: all-local
41 if test -f $(charset_alias); then \
42--
432.11.0
44
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 \
27 file://fix_for_manpage_building.patch \ 27 file://fix_for_manpage_building.patch \
28 file://loadavg.patch \ 28 file://loadavg.patch \
29 file://no-man.patch \ 29 file://no-man.patch \
30 file://build-don-t-need-charset.alias-when-building-for-mus.patch \
30 " 31 "
31 32
32SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06" 33SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06"