diff options
Diffstat (limited to 'meta')
-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 | ||||
-rw-r--r-- | meta/site/common-linux | 3 |
3 files changed, 18 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> | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] | 9 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] |
10 | 10 | ||
11 | Index: coreutils-8.12/m4/getloadavg.m4 | 11 | Index: coreutils-8.14/m4/getloadavg.m4 |
12 | =================================================================== | 12 | =================================================================== |
13 | --- coreutils-8.12.orig/m4/getloadavg.m4 2011-08-03 14:03:59.982197767 -0700 | 13 | --- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700 |
14 | +++ coreutils-8.12/m4/getloadavg.m4 2011-08-03 14:04:20.402197763 -0700 | 14 | +++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700 |
15 | @@ -44,16 +44,6 @@ AC_CHECK_FUNC([getloadavg], [], | 15 | @@ -41,16 +41,6 @@ |
16 | [LIBS="-lutil $LIBS" gl_have_func=yes]) | 16 | [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) |
17 | fi | 17 | fi |
18 | 18 | ||
19 | - if test $gl_have_func = no; then | 19 | - if test $gl_func_getloadavg_done = no; then |
20 | - # There is a commonly available library for RS/6000 AIX. | 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. | 21 | - # Since it is not a standard part of AIX, it might be installed locally. |
22 | - gl_getloadavg_LIBS=$LIBS | 22 | - gl_getloadavg_LIBS=$LIBS |
23 | - LIBS="-L/usr/local/lib $LIBS" | 23 | - LIBS="-L/usr/local/lib $LIBS" |
24 | - AC_CHECK_LIB([getloadavg], [getloadavg], | 24 | - AC_CHECK_LIB([getloadavg], [getloadavg], |
25 | - [LIBS="-lgetloadavg $LIBS" gl_have_func=yes], | 25 | - [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], |
26 | - [LIBS=$gl_getloadavg_LIBS]) | 26 | - [LIBS=$gl_getloadavg_LIBS]) |
27 | - fi | 27 | - fi |
28 | - | 28 | - |
29 | # Set up the replacement function if necessary. | 29 | # Set up the replacement function if necessary. |
30 | if test $gl_have_func = no; then | 30 | if test $gl_func_getloadavg_done = no; then |
31 | AC_LIBOBJ([getloadavg]) | 31 | 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" | |||
7 | LICENSE = "GPLv3+" | 7 | LICENSE = "GPLv3+" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ | 8 | LIC_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" |
10 | PR = "r3" | 10 | PR = "r0" |
11 | DEPENDS = "gmp" | 11 | DEPENDS = "gmp" |
12 | DEPENDS_virtclass-native = "" | 12 | DEPENDS_virtclass-native = "" |
13 | 13 | ||
14 | inherit autotools gettext | 14 | inherit autotools gettext |
15 | 15 | ||
16 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.gz \ | 16 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ |
17 | file://remove-usr-local-lib-from-m4.patch \ | 17 | file://remove-usr-local-lib-from-m4.patch \ |
18 | " | 18 | " |
19 | 19 | SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a" | |
20 | SRC_URI[md5sum] = "fce7999953a67243d00d75cc86dbcaa6" | 20 | SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d" |
21 | SRC_URI[sha256sum] = "9e233a62c98a3378a7b0483d2ae3d662dbaf6cd3917d3830d3514665e12a85c8" | ||
22 | 21 | ||
23 | EXTRA_OECONF_virtclass-native = "--without-gmp" | 22 | EXTRA_OECONF_virtclass-native = "--without-gmp" |
24 | 23 | ||
@@ -49,6 +48,8 @@ do_install_append() { | |||
49 | # in update-alternatives to fail, therefore use lbracket - the name used | 48 | # in update-alternatives to fail, therefore use lbracket - the name used |
50 | # for the actual source file. | 49 | # for the actual source file. |
51 | mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} | 50 | mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN} |
51 | install -d ${D}${libdir}/coreutils | ||
52 | mv ${D}${libexecdir}/coreutils/libstdbuf.so ${D}${libdir}/coreutils | ||
52 | } | 53 | } |
53 | 54 | ||
54 | pkg_postinst_${PN} () { | 55 | pkg_postinst_${PN} () { |
diff --git a/meta/site/common-linux b/meta/site/common-linux index 00ac7173a5..947ed5b7d3 100644 --- a/meta/site/common-linux +++ b/meta/site/common-linux | |||
@@ -34,6 +34,9 @@ bash_cv_job_control_missing=${bash_cv_job_control_missing=present} | |||
34 | bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} | 34 | bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} |
35 | bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} | 35 | bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} |
36 | 36 | ||
37 | # coreutils | ||
38 | gl_cv_func_fstatat_zero_flag=${gl_cv_func_fstatat_zero_flag=yes} | ||
39 | |||
37 | # mysql | 40 | # mysql |
38 | ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes} | 41 | ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes} |
39 | ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} | 42 | ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} |