From 03abdeff300505b09df503111c7174419d9df101 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 24 May 2014 22:47:28 +0200 Subject: fix findutils hostcompile on OpenBSD 5.5 --- package/findutils/Makefile | 2 +- package/findutils/patches/patch-configure_ac | 12 ++++++------ package/findutils/patches/patch-gnulib_lib_freadahead_h | 11 +++++------ package/findutils/patches/patch-gnulib_lib_fseeko_c | 6 +++--- package/findutils/patches/patch-gnulib_lib_getdate_y | 11 +++++++++++ 5 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 package/findutils/patches/patch-gnulib_lib_getdate_y (limited to 'package') diff --git a/package/findutils/Makefile b/package/findutils/Makefile index 7e1919451..8c4350522 100644 --- a/package/findutils/Makefile +++ b/package/findutils/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= findutils PKG_VERSION:= 4.4.2 -PKG_RELEASE:= 5 +PKG_RELEASE:= 6 PKG_MD5SUM:= 351cc4adb07d54877fa15f75fb77d39f PKG_DESCR:= utilities for finding files (also provided by busybox) PKG_SECTION:= core diff --git a/package/findutils/patches/patch-configure_ac b/package/findutils/patches/patch-configure_ac index e9c55722d..7a4dacf45 100644 --- a/package/findutils/patches/patch-configure_ac +++ b/package/findutils/patches/patch-configure_ac @@ -1,5 +1,5 @@ ---- findutils-4.4.2.orig/configure.ac 2009-05-16 17:27:39.000000000 +0200 -+++ findutils-4.4.2/configure.ac 2014-04-23 15:58:08.081495622 +0200 +--- findutils-4.4.2.orig/configure.ac Sat May 16 17:27:39 2009 ++++ findutils-4.4.2/configure.ac Sat May 24 15:13:05 2014 @@ -77,8 +77,6 @@ AC_PROG_CPP dnl for gnulib gl_EARLY @@ -9,14 +9,14 @@ AC_PROG_INSTALL AC_PROG_RANLIB dnl AC_PROG_LIBTOOL -@@ -204,10 +202,6 @@ AC_CHECK_MEMBER(struct dirent.d_type,,,[ +@@ -203,10 +201,6 @@ AC_CHECK_MEMBER(struct dirent.d_type,,,[ + #include ]) jy_AC_ATTRIBUTE_NORETURN - +- -dnl internationalization macros -AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.14.5) -- + dnl regextype.c and regexprops.c are designed to be usable outside findutils, dnl but findutils doesn't want to support all the regex types in gnulib, - dnl and wants to support an additional one (RE_SYNTAX_EMACS|RE_DOT_NEWLINE). diff --git a/package/findutils/patches/patch-gnulib_lib_freadahead_h b/package/findutils/patches/patch-gnulib_lib_freadahead_h index 194232201..6cd605e41 100644 --- a/package/findutils/patches/patch-gnulib_lib_freadahead_h +++ b/package/findutils/patches/patch-gnulib_lib_freadahead_h @@ -1,6 +1,6 @@ ---- findutils-4.4.2.orig/gnulib/lib/freadahead.h 2009-05-10 23:23:57.000000000 +0200 -+++ findutils-4.4.2/gnulib/lib/freadahead.h 2014-03-23 16:27:43.000000000 +0100 -@@ -29,8 +29,21 @@ extern "C" { +--- findutils-4.4.2.orig/gnulib/lib/freadahead.h Sun May 10 23:23:57 2009 ++++ findutils-4.4.2/gnulib/lib/freadahead.h Sat May 24 15:13:05 2014 +@@ -29,7 +29,20 @@ extern "C" { STREAM must not be wide-character oriented. */ @@ -16,9 +16,8 @@ +#else + extern size_t freadahead (FILE *stream); - -+#endif + ++#endif + #ifdef __cplusplus } - #endif diff --git a/package/findutils/patches/patch-gnulib_lib_fseeko_c b/package/findutils/patches/patch-gnulib_lib_fseeko_c index aba9a1133..d3ae84a8d 100644 --- a/package/findutils/patches/patch-gnulib_lib_fseeko_c +++ b/package/findutils/patches/patch-gnulib_lib_fseeko_c @@ -1,6 +1,6 @@ ---- findutils-4.4.2.orig/gnulib/lib/fseeko.c 2009-05-10 23:25:10.000000000 +0200 -+++ findutils-4.4.2/gnulib/lib/fseeko.c 2014-03-23 16:35:34.000000000 +0100 -@@ -94,8 +94,14 @@ rpl_fseeko (FILE *fp, off_t offset, int +--- findutils-4.4.2.orig/gnulib/lib/fseeko.c Sun May 10 23:25:10 2009 ++++ findutils-4.4.2/gnulib/lib/fseeko.c Sat May 24 15:13:05 2014 +@@ -94,8 +94,14 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) if ((fp->_Mode & _MWRITE ? fp->_Next == fp->_Buf : fp->_Next == fp->_Rend) && fp->_Rback == fp->_Back + sizeof (fp->_Back) && fp->_Rsave == NULL) diff --git a/package/findutils/patches/patch-gnulib_lib_getdate_y b/package/findutils/patches/patch-gnulib_lib_getdate_y new file mode 100644 index 000000000..32445eab7 --- /dev/null +++ b/package/findutils/patches/patch-gnulib_lib_getdate_y @@ -0,0 +1,11 @@ +--- findutils-4.4.2.orig/gnulib/lib/getdate.y Sun May 10 23:23:57 2009 ++++ findutils-4.4.2/gnulib/lib/getdate.y Sat May 24 15:28:27 2014 +@@ -114,7 +114,7 @@ + wraps around, but there's no portable way to check for that at + compile-time. */ + verify (TYPE_IS_INTEGER (time_t)); +-verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX); ++//verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX); + + /* An integer value, and the number of digits in its textual + representation. */ -- cgit v1.2.3