diff options
Diffstat (limited to 'meta/recipes-core/coreutils')
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch (renamed from meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch) | 18 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.14.bb (renamed from meta/recipes-core/coreutils/coreutils_8.12.bb) | 11 |
2 files changed, 15 insertions, 14 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.14/remove-usr-local-lib-from-m4.patch index aac097a4ce..2ef8a548ac 100644 --- a/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch +++ b/meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch @@ -8,24 +8,24 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] -Index: coreutils-8.12/m4/getloadavg.m4 +Index: coreutils-8.14/m4/getloadavg.m4 =================================================================== ---- coreutils-8.12.orig/m4/getloadavg.m4 2011-08-03 14:03:59.982197767 -0700 -+++ coreutils-8.12/m4/getloadavg.m4 2011-08-03 14:04:20.402197763 -0700 -@@ -44,16 +44,6 @@ AC_CHECK_FUNC([getloadavg], [], - [LIBS="-lutil $LIBS" gl_have_func=yes]) +--- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700 ++++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700 +@@ -41,16 +41,6 @@ + [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) fi -- if test $gl_have_func = no; then +- if test $gl_func_getloadavg_done = no; then - # There is a commonly available library for RS/6000 AIX. - # Since it is not a standard part of AIX, it might be installed locally. - gl_getloadavg_LIBS=$LIBS - LIBS="-L/usr/local/lib $LIBS" - AC_CHECK_LIB([getloadavg], [getloadavg], -- [LIBS="-lgetloadavg $LIBS" gl_have_func=yes], +- [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], - [LIBS=$gl_getloadavg_LIBS]) - fi - # Set up the replacement function if necessary. - if test $gl_have_func = no; then - AC_LIBOBJ([getloadavg]) + if test $gl_func_getloadavg_done = no; then + HAVE_GETLOADAVG=0 diff --git a/meta/recipes-core/coreutils/coreutils_8.12.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb index 0004ce7fc8..f3b7af7d13 100644 --- a/meta/recipes-core/coreutils/coreutils_8.12.bb +++ b/meta/recipes-core/coreutils/coreutils_8.14.bb @@ -7,18 +7,17 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad" -PR = "r3" +PR = "r0" DEPENDS = "gmp" DEPENDS_virtclass-native = "" inherit autotools gettext -SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.gz \ +SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ " - -SRC_URI[md5sum] = "fce7999953a67243d00d75cc86dbcaa6" -SRC_URI[sha256sum] = "9e233a62c98a3378a7b0483d2ae3d662dbaf6cd3917d3830d3514665e12a85c8" +SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a" +SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d" EXTRA_OECONF_virtclass-native = "--without-gmp" @@ -49,6 +48,8 @@ do_install_append() { # in update-alternatives to fail, therefore use lbracket - the name used # for the actual source file. mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} + install -d ${D}${libdir}/coreutils + mv ${D}${libexecdir}/coreutils/libstdbuf.so ${D}${libdir}/coreutils } pkg_postinst_${PN} () { |