mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-25 06:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

coreutils_6.9: fix musl compilation

Browse Source 
As per the patch

(From OE-Core rev: a0cb33b3285de03ae901e474da255efc88811c2d)

Signed-off-by: André Draszik <adraszik@tycoint.com>
Acked-by: Sylvain Lemieux <slemieux@tycoint.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

Cherry-pick from meta-gplv2:

  http://git.yoctoproject.org/cgit/cgit.cgi/meta-gplv2/commit/?id=e42ded0ee35d0aab0de8fa090eda9f1c08bcbb4c

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
André Draszik
2017-10-02 19:16:00 -07:00
committed by Richard Purdie
parent 169aff63bf
commit c51ac0b5c3
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch Normal file
View File

@@ -0,0 +1,46 @@
From 542811eecc05c6c43590bde3852598aa6277abf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com>
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 <adraszik@tycoint.com>
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
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

1
meta/recipes-core/coreutils/coreutils_6.9.bb
View File

@@ -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"