summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-08-03 14:12:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-05 17:16:00 +0100
commit378151b53a9509224029f160f0d119a5bc2402c5 (patch)
tree6279051277687a9ad468feeb1c0a004a4a0f8671 /meta/recipes-core
parent281fc55ff913bb485cd208c816b91207928c9d96 (diff)
downloadpoky-378151b53a9509224029f160f0d119a5bc2402c5.tar.gz
coreutils: Fix build on uclibc
coreutils has getloadavg.m4 of its own. So we need to make sure that we remove the portions which look into hardcoded /usr/local/lib paths. These tests are only for AIX so we dont lose much (From OE-Core rev: e9a49ebe3a1c83aa022eb07f3ca87b3d71c742f9) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch31
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.12.bb6
2 files changed, 35 insertions, 2 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch
new file mode 100644
index 0000000000..aac097a4ce
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-8.12/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.12/m4/getloadavg.m4
12===================================================================
13--- coreutils-8.12.orig/m4/getloadavg.m4 2011-08-03 14:03:59.982197767 -0700
14+++ coreutils-8.12/m4/getloadavg.m4 2011-08-03 14:04:20.402197763 -0700
15@@ -44,16 +44,6 @@ AC_CHECK_FUNC([getloadavg], [],
16 [LIBS="-lutil $LIBS" gl_have_func=yes])
17 fi
18
19- if test $gl_have_func = 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_have_func=yes],
26- [LIBS=$gl_getloadavg_LIBS])
27- fi
28-
29 # Set up the replacement function if necessary.
30 if test $gl_have_func = no; then
31 AC_LIBOBJ([getloadavg])
diff --git a/meta/recipes-core/coreutils/coreutils_8.12.bb b/meta/recipes-core/coreutils/coreutils_8.12.bb
index 00746b908a..0004ce7fc8 100644
--- a/meta/recipes-core/coreutils/coreutils_8.12.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.12.bb
@@ -7,13 +7,15 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils"
7LICENSE = "GPLv3+" 7LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ 8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
9 file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad" 9 file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad"
10PR = "r2" 10PR = "r3"
11DEPENDS = "gmp" 11DEPENDS = "gmp"
12DEPENDS_virtclass-native = "" 12DEPENDS_virtclass-native = ""
13 13
14inherit autotools gettext 14inherit autotools gettext
15 15
16SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.gz" 16SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.gz \
17 file://remove-usr-local-lib-from-m4.patch \
18 "
17 19
18SRC_URI[md5sum] = "fce7999953a67243d00d75cc86dbcaa6" 20SRC_URI[md5sum] = "fce7999953a67243d00d75cc86dbcaa6"
19SRC_URI[sha256sum] = "9e233a62c98a3378a7b0483d2ae3d662dbaf6cd3917d3830d3514665e12a85c8" 21SRC_URI[sha256sum] = "9e233a62c98a3378a7b0483d2ae3d662dbaf6cd3917d3830d3514665e12a85c8"