coreutils: musl build fix for gplv2 coreutils recipe
v2 cover coreutils: musl build fix for gplv2 coreutils recipe
Two minor patches backported from meta-gplv2 for the gplv2 coreutils recipe in oe-core morty.
v2: Add Signed-off-by's to both patches + reference upstream meta-gplv2 commits and add _6.9 suffix in both commit messages.
André Draszik (1):
coreutils_6.9: fix musl compilation
Richard Purdie (1):
coreutils_6.9: Disable broken man pages
...-need-charset.alias-when-building-for-mus.patch | 46 ++++++++++++++++++++++ .../coreutils/coreutils-6.9/no-man.patch | 21 ++++++++++ meta/recipes-core/coreutils/coreutils_6.9.bb | 2 + 3 files changed, 69 insertions(+) create mode 100644 meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch create mode 100644 meta/recipes-core/coreutils/coreutils-6.9/no-man.patch
Signature · 1 line
1.9.1
PATCH v2 1/2 coreutils_6.9: Disable broken man pages
From: Richard Purdie <[email protected]>
These are generated from --help output of the host tools which is clearly incorrect, particularly given the older nature of this recipe. Simply disable them entirely.
Signed-off-by Richard Purdie <[email protected]>
Cherry-pick from meta-gplv2:
Signed-off-by Andre McCurdy <[email protected]>
--- .../coreutils/coreutils-6.9/no-man.patch | 21 +++++++++++++++++++++ meta/recipes-core/coreutils/coreutils_6.9.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-core/coreutils/coreutils-6.9/no-man.patch
meta/recipes-core/coreutils/coreutils-6.9/no-man.patch new file +21 -0
@@ -0,0 +1,21 @@ +Disable manpages for coreutils. These are generated by running the host version --help +which is going to give incorrect results so its better simply not to do this at all. + +RP 2017/3/9 +Upstream-Status: Inappropriate [OE cross compile specific hack] + +Signed-off-by: Andre McCurdy <[email protected]> + +Index: coreutils-6.9/Makefile.am +=================================================================== +--- coreutils-6.9.orig/Makefile.am ++++ coreutils-6.9/Makefile.am +@@ -17,7 +17,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + # 02110-1301, USA. + +-SUBDIRS = lib src doc man po tests ++SUBDIRS = lib src doc po tests + EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \ + .gitignore \ + .hgignore \
meta/recipes-core/coreutils/coreutils_6.9.bb +1 -0
@@ -26,6 +26,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ file://coreutils-fix-texinfo.patch \ file://fix_for_manpage_building.patch \ file://loadavg.patch \ + file://no-man.patch \ " SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06"
Signature · 1 line
1.9.1
PATCH v2 2/2 coreutils_6.9: fix musl compilation
In reply to Andre McCurdyFrom: André Draszik <[email protected]>
As per the patch
Signed-off-by André Draszik <[email protected]>
Acked-by Sylvain Lemieux <[email protected]>
Signed-off-by Ross Burton <[email protected]>
Cherry-pick from meta-gplv2:
Signed-off-by Andre McCurdy <[email protected]>
--- ...-need-charset.alias-when-building-for-mus.patch | 46 ++++++++++++++++++++++ meta/recipes-core/coreutils/coreutils_6.9.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch
meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch new file +46 -0
@@ -0,0 +1,46 @@ +From 542811eecc05c6c43590bde3852598aa6277abf3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <[email protected]> +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 <[email protected]> +Signed-off-by: Andre McCurdy <[email protected]> +--- + 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 +
meta/recipes-core/coreutils/coreutils_6.9.bb +1 -0
@@ -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"
Signature · 1 line
1.9.1
Quoted 2 lines · Andre McCurdy
Two minor patches backported from meta-gplv2 for the gplv2 coreutils recipe in oe-core morty.
Ping. CCing Armin.
Quoted 19 lines
v2: Add Signed-off-by's to both patches + reference upstream meta-gplv2 commits and add _6.9 suffix in both commit messages.
André Draszik (1):
coreutils_6.9: fix musl compilationRichard Purdie (1):
coreutils_6.9: Disable broken man pages...-need-charset.alias-when-building-for-mus.patch | 46 ++++++++++++++++++++++ .../coreutils/coreutils-6.9/no-man.patch | 21 ++++++++++ meta/recipes-core/coreutils/coreutils_6.9.bb | 2 + 3 files changed, 69 insertions(+) create mode 100644 meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch create mode 100644 meta/recipes-core/coreutils/coreutils-6.9/no-man.patch--
1.9.1