diff options
| author | André Draszik <adraszik@tycoint.com> | 2017-10-02 19:16:00 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-21 14:43:55 +0000 |
| commit | c51ac0b5c312cec957193aa078a17d38b4884de7 (patch) | |
| tree | cce6f9f7d9df763ed5f11870e3a53b7a05cc7347 | |
| parent | 169aff63bf01a5281b5af8722039c2549b105ec9 (diff) | |
| download | poky-c51ac0b5c312cec957193aa078a17d38b4884de7.tar.gz | |
coreutils_6.9: fix musl compilation
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>
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch | 46 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_6.9.bb | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch b/meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch new file mode 100644 index 0000000000..d661e59f13 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | From 542811eecc05c6c43590bde3852598aa6277abf3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com> | ||
| 3 | Date: Thu, 23 Mar 2017 12:46:07 +0000 | ||
| 4 | Subject: [PATCH] build: don't need charset.alias when building for musl | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [required for coreutils 6.9 (GPLv2) recipe only] | ||
| 10 | |||
| 11 | Signed-off-by: André Draszik <adraszik@tycoint.com> | ||
| 12 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
| 13 | --- | ||
| 14 | lib/gnulib.mk | 9 +++++++-- | ||
| 15 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/lib/gnulib.mk b/lib/gnulib.mk | ||
| 18 | index e833d14..04b2b74 100644 | ||
| 19 | --- a/lib/gnulib.mk | ||
| 20 | +++ b/lib/gnulib.mk | ||
| 21 | @@ -907,7 +907,11 @@ all-local: charset.alias ref-add.sed ref-del.sed | ||
| 22 | charset_alias = $(DESTDIR)$(libdir)/charset.alias | ||
| 23 | charset_tmp = $(DESTDIR)$(libdir)/charset.tmp | ||
| 24 | install-exec-local: all-local | ||
| 25 | - test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) | ||
| 26 | + case '$(host_os)' in \ | ||
| 27 | + linux-musl*) \ | ||
| 28 | + : ;;\ | ||
| 29 | + *) \ | ||
| 30 | + test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) ;\ | ||
| 31 | if test -f $(charset_alias); then \ | ||
| 32 | sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ | ||
| 33 | $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ | ||
| 34 | @@ -918,7 +922,8 @@ install-exec-local: all-local | ||
| 35 | $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ | ||
| 36 | rm -f $(charset_tmp) ; \ | ||
| 37 | fi ; \ | ||
| 38 | - fi | ||
| 39 | + fi ;\ | ||
| 40 | + esac | ||
| 41 | |||
| 42 | uninstall-local: all-local | ||
| 43 | if test -f $(charset_alias); then \ | ||
| 44 | -- | ||
| 45 | 2.11.0 | ||
| 46 | |||
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb index 6bcf8de50c..d04edd8d88 100644 --- a/meta/recipes-core/coreutils/coreutils_6.9.bb +++ b/meta/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 | ||
| 32 | SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06" | 33 | SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06" |
