diff options
Diffstat (limited to 'meta/recipes-core/coreutils/coreutils-8.24')
4 files changed, 130 insertions, 0 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.24/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-core/coreutils/coreutils-8.24/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..abdfa2a50b --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.24/0001-Unset-need_charset_alias-when-building-for-musl.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 13 Apr 2015 17:02:13 -0700 | ||
4 | Subject: [PATCH] Unset need_charset_alias when building for musl | ||
5 | |||
6 | localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 | ||
7 | which actually shoudl be fixed in gnulib and then all downstream | ||
8 | projects will get it eventually. For now we apply the fix to | ||
9 | coreutils | ||
10 | |||
11 | Upstream-Status: Not Required | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | lib/gnulib.mk | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/lib/gnulib.mk b/lib/gnulib.mk | ||
19 | index e1d74db..c0e92dd 100644 | ||
20 | --- a/lib/gnulib.mk | ||
21 | +++ b/lib/gnulib.mk | ||
22 | @@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local | ||
23 | case '$(host_os)' in \ | ||
24 | darwin[56]*) \ | ||
25 | need_charset_alias=true ;; \ | ||
26 | - darwin* | cygwin* | mingw* | pw32* | cegcc*) \ | ||
27 | + darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ | ||
28 | need_charset_alias=false ;; \ | ||
29 | *) \ | ||
30 | need_charset_alias=true ;; \ | ||
31 | -- | ||
32 | 2.1.4 | ||
33 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.24/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils-8.24/fix-selinux-flask.patch new file mode 100644 index 0000000000..9d1ae55d47 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.24/fix-selinux-flask.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Tue, 16 Sep 2014 01:59:08 -0700 | ||
4 | Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to | ||
5 | with_selinux | ||
6 | |||
7 | Fixed when build with meta-selinux even when --without-selinux: | ||
8 | runcon.c:49:28: fatal error: selinux/flask.h: No such file or directory | ||
9 | # include <selinux/flask.h> | ||
10 | ^ | ||
11 | compilation terminated. | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
16 | --- | ||
17 | m4/gnulib-comp.m4 | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 | ||
21 | index 472d3a0..5f09734 100644 | ||
22 | --- a/m4/gnulib-comp.m4 | ||
23 | +++ b/m4/gnulib-comp.m4 | ||
24 | @@ -1730,11 +1730,11 @@ AC_DEFUN([gl_INIT], | ||
25 | AC_LIBOBJ([select]) | ||
26 | fi | ||
27 | gl_SYS_SELECT_MODULE_INDICATOR([select]) | ||
28 | - AC_CHECK_HEADERS([selinux/flask.h]) | ||
29 | AC_LIBOBJ([selinux-at]) | ||
30 | gl_HEADERS_SELINUX_SELINUX_H | ||
31 | gl_HEADERS_SELINUX_CONTEXT_H | ||
32 | if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then | ||
33 | + AC_CHECK_HEADERS([selinux/flask.h]) | ||
34 | AC_LIBOBJ([getfilecon]) | ||
35 | fi | ||
36 | gl_SERVENT | ||
37 | -- | ||
38 | 1.7.9.5 | ||
39 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.24/man-decouple-manpages-from-build.patch b/meta/recipes-core/coreutils/coreutils-8.24/man-decouple-manpages-from-build.patch new file mode 100644 index 0000000000..3c896a11bf --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.24/man-decouple-manpages-from-build.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From b4d258629f090066783c3b4c91b40f63b9d0a296 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
3 | Date: Sun, 8 Feb 2015 16:51:57 -0500 | ||
4 | Subject: [PATCH] man: decouple manpages from build | ||
5 | |||
6 | The use of "help2man" doesn't work at all for cross compile, in | ||
7 | addition to the extra requirement of perl it adds. | ||
8 | |||
9 | Just decouple the manpages from the build in order to pave the way for | ||
10 | importing prebuilt manpages that can be used in a cross build situation. | ||
11 | |||
12 | Upstream-Status: Inappropriate [upstream doesn't care about x-compile case.] | ||
13 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
14 | |||
15 | diff --git a/Makefile.am b/Makefile.am | ||
16 | index fb4af27..7576b2c 100644 | ||
17 | --- a/Makefile.am | ||
18 | +++ b/Makefile.am | ||
19 | @@ -214,5 +214,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src | ||
20 | include $(top_srcdir)/lib/local.mk | ||
21 | include $(top_srcdir)/src/local.mk | ||
22 | include $(top_srcdir)/doc/local.mk | ||
23 | -include $(top_srcdir)/man/local.mk | ||
24 | include $(top_srcdir)/tests/local.mk | ||
25 | -- | ||
26 | 2.2.2 | ||
27 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.24/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.24/remove-usr-local-lib-from-m4.patch new file mode 100644 index 0000000000..2ef8a548ac --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.24/remove-usr-local-lib-from-m4.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | We have problem using hardcoded directories like /usr/local here | ||
2 | which will be checked for cross builds. This is a special case which | ||
3 | is valid for AIX only. We do not have AIX as one of our supported | ||
4 | build host or target. Therefore we get rid of the hardcoded paths | ||
5 | and make life easier for cross compilation process. | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] | ||
10 | |||
11 | Index: coreutils-8.14/m4/getloadavg.m4 | ||
12 | =================================================================== | ||
13 | --- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700 | ||
14 | +++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700 | ||
15 | @@ -41,16 +41,6 @@ | ||
16 | [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) | ||
17 | fi | ||
18 | |||
19 | - if test $gl_func_getloadavg_done = no; then | ||
20 | - # There is a commonly available library for RS/6000 AIX. | ||
21 | - # Since it is not a standard part of AIX, it might be installed locally. | ||
22 | - gl_getloadavg_LIBS=$LIBS | ||
23 | - LIBS="-L/usr/local/lib $LIBS" | ||
24 | - AC_CHECK_LIB([getloadavg], [getloadavg], | ||
25 | - [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], | ||
26 | - [LIBS=$gl_getloadavg_LIBS]) | ||
27 | - fi | ||
28 | - | ||
29 | # Set up the replacement function if necessary. | ||
30 | if test $gl_func_getloadavg_done = no; then | ||
31 | HAVE_GETLOADAVG=0 | ||