diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-21 16:27:20 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-21 16:27:20 +0100 |
commit | f4c748be56e6b6731537624bb333d001469f4f50 (patch) | |
tree | 04a9fef58f07da4cdca14f6340e689d022974b1a | |
parent | 664f0acd54623594267a7f73370c0acb145134b9 (diff) |
fix uclibc compile
-rw-r--r-- | package/coreutils/Makefile | 6 | ||||
-rw-r--r-- | package/coreutils/patches/patch-lib_fseeko_c | 15 | ||||
-rw-r--r-- | package/coreutils/patches/patch-m4_fflush_m4 | 31 | ||||
-rw-r--r-- | package/coreutils/patches/patch-m4_fseeko_m4 | 11 |
4 files changed, 3 insertions, 60 deletions
diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index 26a501fd8..1d0a9830d 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= coreutils -PKG_VERSION:= 8.21 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 065ba41828644eca5dd8163446de5d64 +PKG_VERSION:= 8.22 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 8fb0ae2267aa6e728958adc38f8163a2 PKG_DESCR:= basic file, shell and text manipulation utilities PKG_SECTION:= base PKG_BUILDDEP:= gmp autotool diff --git a/package/coreutils/patches/patch-lib_fseeko_c b/package/coreutils/patches/patch-lib_fseeko_c deleted file mode 100644 index 9687be6b8..000000000 --- a/package/coreutils/patches/patch-lib_fseeko_c +++ /dev/null @@ -1,15 +0,0 @@ ---- coreutils-8.21.orig/lib/fseeko.c 2013-01-04 15:07:03.000000000 +0100 -+++ coreutils-8.21/lib/fseeko.c 2013-11-04 20:32:38.000000000 +0100 -@@ -99,6 +99,12 @@ fseeko (FILE *fp, off_t offset, int when - #elif defined EPLAN9 /* Plan9 */ - if (fp->rp == fp->buf - && fp->wp == fp->buf) -+#elif FUNC_FFLUSH_STDIN < 0 && 200809 <= _POSIX_VERSION -+ /* Cross-compiling to some other system advertising conformance to -+ POSIX.1-2008 or later. Assume fseeko and fflush work as advertised. -+ If this assumption is incorrect, please report the bug to -+ bug-gnulib. */ -+ if (0) - #else - #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib." - #endif diff --git a/package/coreutils/patches/patch-m4_fflush_m4 b/package/coreutils/patches/patch-m4_fflush_m4 deleted file mode 100644 index 19ad1b49b..000000000 --- a/package/coreutils/patches/patch-m4_fflush_m4 +++ /dev/null @@ -1,31 +0,0 @@ ---- coreutils-8.21.orig/m4/fflush.m4 2013-01-02 13:34:46.000000000 +0100 -+++ coreutils-8.21/m4/fflush.m4 2013-11-04 20:32:38.000000000 +0100 -@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_FFLUSH], - [ - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - gl_FUNC_FFLUSH_STDIN -- if test $gl_cv_func_fflush_stdin = no; then -+ if test $gl_cv_func_fflush_stdin != yes; then - REPLACE_FFLUSH=1 - fi - ]) -@@ -72,10 +72,17 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN], - return 7; - return 0; - ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no], -- [dnl Pessimistically assume fflush is broken. -- gl_cv_func_fflush_stdin=no]) -+ [gl_cv_func_fflush_stdin=cross]) - rm conftest.txt - ]) -+ case $gl_cv_func_fflush_stdin in -+ yes) gl_func_fflush_stdin=1 ;; -+ no) gl_func_fflush_stdin=0 ;; -+ *) gl_func_fflush_stdin='(-1)' ;; -+ esac -+ AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin], -+ [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008, -+ 0 if fflush is known to not work, -1 if unknown.]) - ]) - - # Prerequisites of lib/fflush.c. diff --git a/package/coreutils/patches/patch-m4_fseeko_m4 b/package/coreutils/patches/patch-m4_fseeko_m4 deleted file mode 100644 index 1d6da43f8..000000000 --- a/package/coreutils/patches/patch-m4_fseeko_m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- coreutils-8.21.orig/m4/fseeko.m4 2013-01-02 13:34:46.000000000 +0100 -+++ coreutils-8.21/m4/fseeko.m4 2013-11-04 20:32:38.000000000 +0100 -@@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_FSEEKO], - fi - m4_ifdef([gl_FUNC_FFLUSH_STDIN], [ - gl_FUNC_FFLUSH_STDIN -- if test $gl_cv_func_fflush_stdin = no; then -+ if test $gl_cv_func_fflush_stdin != yes; then - REPLACE_FSEEKO=1 - fi - ]) |