summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/coreutils/coreutils-8.22
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/coreutils/coreutils-8.22')
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch22
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch31
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch31
3 files changed, 84 insertions, 0 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch
new file mode 100644
index 0000000000..4757f52aa0
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch
@@ -0,0 +1,22 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk
5--- coreutils-8.21/man/local.mk 2013-02-05 16:01:21.000000000 +0200
6+++ coreutils-8.21/man/local.mk 2013-03-23 09:12:53.360470192 +0200
7@@ -19,11 +19,11 @@
8 EXTRA_DIST += man/help2man man/dummy-man
9
10 ## Graceful degradation for systems lacking perl.
11-if HAVE_PERL
12-run_help2man = $(PERL) -- $(srcdir)/man/help2man
13-else
14+#if HAVE_PERL
15+#run_help2man = $(PERL) -- $(srcdir)/man/help2man
16+#else
17 run_help2man = $(SHELL) $(srcdir)/man/dummy-man
18-endif
19+#endif
20
21 man1_MANS = @man1_MANS@
22 EXTRA_DIST += $(man1_MANS:.1=.x)
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch b/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch
new file mode 100644
index 0000000000..b7e82609bd
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch
@@ -0,0 +1,31 @@
1Upstream-Status: Pending
2
3coreutils: fix for dummy-man usage
4
5The options should be before the final argument, otherwise, the following error
6would appear when compiling.
7
8"dummy-man: too many non-option arguments"
9
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
11---
12 man/local.mk | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/man/local.mk b/man/local.mk
16index 7cef5e3..dc0865f 100644
17--- a/man/local.mk
18+++ b/man/local.mk
19@@ -189,8 +189,8 @@ man/yes.1: src/yes
20 && $(run_help2man) \
21 --source='$(PACKAGE_STRING)' \
22 --include=$(srcdir)/man/$$name.x \
23- --output=$$t/$$name.1 $$t/$$name \
24 --info-page='coreutils \(aq'$$name' invocation\(aq' \
25+ --output=$$t/$$name.1 $$t/$$name \
26 && sed \
27 -e 's|$*\.td/||g' \
28 -e '/For complete documentation/d' \
29--
301.7.9.5
31
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch
new file mode 100644
index 0000000000..2ef8a548ac
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch
@@ -0,0 +1,31 @@
1We have problem using hardcoded directories like /usr/local here
2which will be checked for cross builds. This is a special case which
3is valid for AIX only. We do not have AIX as one of our supported
4build host or target. Therefore we get rid of the hardcoded paths
5and make life easier for cross compilation process.
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Upstream-Status: Inappropriate [Upstream does care for AIX while we may not]
10
11Index: 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