From c2a34ea858a331a0960f1b4854697de448f55381 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 20:39:13 +0100
Subject: hudson says: you broke uclibc build

---
 package/findutils/Makefile                         | 25 +++++++++++++++-------
 package/findutils/patches/patch-configure_ac       | 11 ++++++++++
 .../findutils/patches/patch-gnulib_m4_fflush_m4    | 12 +++++------
 3 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 package/findutils/patches/patch-configure_ac

(limited to 'package/findutils')

diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index b3b413932..d89ca77ea 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -5,29 +5,38 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		findutils
 PKG_VERSION:=		4.4.2
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		351cc4adb07d54877fa15f75fb77d39f
 PKG_DESCR:=		GNU utilities for finding files
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		libpthread
+PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.gnu.org/software/findutils/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/findutils/
 
-PKG_SUBPKGS:=		FINDUTILS LOCATE
-PKGSD_LOCATE:=		Locate utility
+PKG_SUBPKGS:=		FIND XARGS LOCATE
+PKGSD_LOCATE:=		locate utility
+PKGSD_XARGS:=		xargs utility
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FINDUTILS,findutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION}))
 $(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		gl_cv_func_wcwidth_works=yes \
 			ac_cv_func_working_mktime=yes
 
-findutils-install:
-	$(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/{find,oldfind,xargs} \
-		 $(IDIR_FINDUTILS)/usr/bin
+find-install:
+	$(INSTALL_DIR) $(IDIR_FIND)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/find \
+		 $(IDIR_FIND)/usr/bin
+
+xargs-install:
+	$(INSTALL_DIR) $(IDIR_XARGS)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xargs \
+		 $(IDIR_XARGS)/usr/bin
 
 locate-install:
 	${INSTALL_DIR} ${IDIR_LOCATE}/usr/{bin,libexec}
diff --git a/package/findutils/patches/patch-configure_ac b/package/findutils/patches/patch-configure_ac
new file mode 100644
index 000000000..34c03d76f
--- /dev/null
+++ b/package/findutils/patches/patch-configure_ac
@@ -0,0 +1,11 @@
+--- findutils-4.4.2.orig/configure.ac	2009-05-16 17:27:39.000000000 +0200
++++ findutils-4.4.2/configure.ac	2014-03-23 19:39:22.000000000 +0100
+@@ -77,8 +77,6 @@ AC_PROG_CPP
+ dnl for gnulib
+ gl_EARLY
+ 
+-AM_C_PROTOTYPES
+-
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ dnl AC_PROG_LIBTOOL
diff --git a/package/findutils/patches/patch-gnulib_m4_fflush_m4 b/package/findutils/patches/patch-gnulib_m4_fflush_m4
index 5cee53cc0..b3dd6a082 100644
--- a/package/findutils/patches/patch-gnulib_m4_fflush_m4
+++ b/package/findutils/patches/patch-gnulib_m4_fflush_m4
@@ -1,6 +1,6 @@
 --- findutils-4.4.2.orig/gnulib/m4/fflush.m4	2009-05-10 23:23:57.000000000 +0200
-+++ findutils-4.4.2/gnulib/m4/fflush.m4	2014-03-23 16:40:29.000000000 +0100
-@@ -32,14 +32,20 @@ AC_DEFUN([gl_FUNC_FFLUSH],
++++ findutils-4.4.2/gnulib/m4/fflush.m4	2014-03-23 18:40:09.000000000 +0100
+@@ -32,12 +32,18 @@ AC_DEFUN([gl_FUNC_FFLUSH],
  	   return 4;
  	 return !(lseek (fd, 0, SEEK_CUR) == 5);
         ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
@@ -11,9 +11,6 @@
       rm conftest.txt
      ])
 -  if test $gl_cv_func_fflush_stdin = no; then
-+  if test $gl_cv_func_fflush_stdin != yes; then
-     gl_REPLACE_FFLUSH
-   fi
 +  case $gl_cv_func_fflush_stdin in
 +    yes) gl_func_fflush_stdin=1 ;;
 +    no)  gl_func_fflush_stdin=0 ;;
@@ -22,6 +19,7 @@
 +  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.])
++  if test $gl_cv_func_fflush_stdin != yes; then
+     gl_REPLACE_FFLUSH
+   fi
  ])
- 
- AC_DEFUN([gl_REPLACE_FFLUSH],
-- 
cgit v1.2.3