From 12fcf3b44e2f1e0f573052a2a0fa867306388541 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 16 Dec 2006 15:49:18 +0000 Subject: findutils: updated to 4.2.29 --- packages/findutils/findutils-4.1.20/.mtn2git_empty | 0 .../findutils/findutils-4.1.20/configure.patch | 90 ---------------------- packages/findutils/findutils-4.1.20/make.patch | 12 --- packages/findutils/findutils-native_4.1.20.bb | 4 - packages/findutils/findutils-native_4.2.29.bb | 7 ++ packages/findutils/findutils.inc | 14 ++++ packages/findutils/findutils_4.1.20.bb | 30 -------- packages/findutils/findutils_4.2.29.bb | 14 ++++ 8 files changed, 35 insertions(+), 136 deletions(-) delete mode 100644 packages/findutils/findutils-4.1.20/.mtn2git_empty delete mode 100644 packages/findutils/findutils-4.1.20/configure.patch delete mode 100644 packages/findutils/findutils-4.1.20/make.patch delete mode 100644 packages/findutils/findutils-native_4.1.20.bb create mode 100644 packages/findutils/findutils-native_4.2.29.bb create mode 100644 packages/findutils/findutils.inc delete mode 100644 packages/findutils/findutils_4.1.20.bb create mode 100644 packages/findutils/findutils_4.2.29.bb (limited to 'packages/findutils') diff --git a/packages/findutils/findutils-4.1.20/.mtn2git_empty b/packages/findutils/findutils-4.1.20/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/findutils/findutils-4.1.20/configure.patch b/packages/findutils/findutils-4.1.20/configure.patch deleted file mode 100644 index de9d6afae4..0000000000 --- a/packages/findutils/findutils-4.1.20/configure.patch +++ /dev/null @@ -1,90 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- findutils-4.1.20/./configure.in~configure -+++ findutils-4.1.20/./configure.in -@@ -1,5 +1,6 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(find/pred.c) -+AC_INIT -+AC_CONFIG_SRCDIR([find/pred.c]) - AM_CONFIG_HEADER(config.h) - AC_CANONICAL_HOST - -@@ -23,7 +24,7 @@ - AC_AIX - AC_MINIX - AC_ISC_POSIX --AC_PROG_CC_STDC -+ - AM_C_PROTOTYPES - AC_PROG_INSTALL - AC_PROG_RANLIB -@@ -48,25 +49,25 @@ - AC_MSG_CHECKING(how to get filesystem type) - fstype=no - # The order of these tests is important. --AC_TRY_CPP([#include --#include ], AC_DEFINE(FSTYPE_STATVFS, 1, [Define to use SVR4 statvfs to get filesystem type.]) fstype=SVR4) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include -+#include ]])],[AC_DEFINE(FSTYPE_STATVFS, 1, Define to use SVR4 statvfs to get filesystem type.) fstype=SVR4],[]) - if test $fstype = no; then --AC_TRY_CPP([#include --#include ], AC_DEFINE(FSTYPE_USG_STATFS, 1, [Define to use SVR3.2 statfs to get filesystem type.]) fstype=SVR3) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include -+#include ]])],[AC_DEFINE(FSTYPE_USG_STATFS, 1, Define to use SVR3.2 statfs to get filesystem type.) fstype=SVR3],[]) - fi - if test $fstype = no; then --AC_TRY_CPP([#include --#include ], AC_DEFINE(FSTYPE_AIX_STATFS, 1, [Define to use AIX3 statfs to get filesystem type.]) fstype=AIX) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include -+#include ]])],[AC_DEFINE(FSTYPE_AIX_STATFS, 1, Define to use AIX3 statfs to get filesystem type.) fstype=AIX],[]) - fi - if test $fstype = no; then --AC_TRY_CPP([#include ], AC_DEFINE(FSTYPE_MNTENT, 1, [Define to use 4.3BSD getmntent to get filesystem type.]) fstype=4.3BSD) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include ]])],[AC_DEFINE(FSTYPE_MNTENT, 1, Define to use 4.3BSD getmntent to get filesystem type.) fstype=4.3BSD],[]) - fi - if test $fstype = no; then - AC_EGREP_HEADER(f_type;, sys/mount.h, AC_DEFINE(FSTYPE_STATFS, 1, [Define to use 4.4BSD and OSF1 statfs to get filesystem type.]) fstype=4.4BSD/OSF1) - fi - if test $fstype = no; then --AC_TRY_CPP([#include --#include ], AC_DEFINE(FSTYPE_GETMNT, 1, [Define to use Ultrix getmnt to get filesystem type.]) fstype=Ultrix) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include -+#include ]])],[AC_DEFINE(FSTYPE_GETMNT, 1, Define to use Ultrix getmnt to get filesystem type.) fstype=Ultrix],[]) - fi - AC_MSG_RESULT($fstype) - -@@ -105,11 +106,11 @@ - # the ANSI2KNR-filtering rules. - #LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'` - AC_CONFIG_SUBDIRS(gnulib) --AC_OUTPUT( -- Makefile -+AC_CONFIG_FILES([Makefile - find/Makefile find/testsuite/Makefile - xargs/Makefile xargs/testsuite/Makefile - locate/Makefile locate/testsuite/Makefile - intl/Makefile po/Makefile.in po/Makefile - doc/Makefile lib/Makefile -- ) -+ ]) -+AC_OUTPUT ---- findutils-4.1.20/./gnulib/configure.ac~configure -+++ findutils-4.1.20/./gnulib/configure.ac -@@ -1,5 +1,5 @@ - # Process this file with autoconf to produce a configure script. --AC_INIT(dummy,0) -+AC_INIT([dummy],[0]) - AM_INIT_AUTOMAKE - - AM_CONFIG_HEADER(config.h) -@@ -95,4 +95,5 @@ - gl_YESNO - - --AC_OUTPUT([Makefile lib/Makefile m4/Makefile po/Makefile]) -+AC_CONFIG_FILES([Makefile lib/Makefile m4/Makefile po/Makefile]) -+AC_OUTPUT diff --git a/packages/findutils/findutils-4.1.20/make.patch b/packages/findutils/findutils-4.1.20/make.patch deleted file mode 100644 index ecebe3b460..0000000000 --- a/packages/findutils/findutils-4.1.20/make.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: findutils-4.1.20/locate/testsuite/Makefile.am -=================================================================== ---- findutils-4.1.20.orig/locate/testsuite/Makefile.am 2001-06-05 02:10:07.000000000 -0400 -+++ findutils-4.1.20/locate/testsuite/Makefile.am 2005-03-11 19:29:30.827233552 -0500 -@@ -13,6 +13,6 @@ - locate.gnu/ignore_case3.exp \ - locate.gnu/ignore_case3.xo - --DIST_SUBDIRS = config inputs locate.gnu -+DIST_SUBDIRS = config locate.gnu - - CLEANFILES = *.log *.sum site.exp site.bak diff --git a/packages/findutils/findutils-native_4.1.20.bb b/packages/findutils/findutils-native_4.1.20.bb deleted file mode 100644 index 5a268cda92..0000000000 --- a/packages/findutils/findutils-native_4.1.20.bb +++ /dev/null @@ -1,4 +0,0 @@ -require findutils_${PV}.bb -inherit native -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}" -S = "${WORKDIR}/findutils-${PV}" diff --git a/packages/findutils/findutils-native_4.2.29.bb b/packages/findutils/findutils-native_4.2.29.bb new file mode 100644 index 0000000000..cb6d72f1e9 --- /dev/null +++ b/packages/findutils/findutils-native_4.2.29.bb @@ -0,0 +1,7 @@ +require findutils.inc + +inherit native + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}" + +S = "${WORKDIR}/findutils-${PV}" diff --git a/packages/findutils/findutils.inc b/packages/findutils/findutils.inc new file mode 100644 index 0000000000..e054dd0cc7 --- /dev/null +++ b/packages/findutils/findutils.inc @@ -0,0 +1,14 @@ +DESCRIPTION = "find, locate, and xargs binaries." +SECTION = "console/utils" +LICENSE = "GPL" + +SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz" + +inherit autotools gettext + +# diffutils assumes non-glibc compilation with uclibc and +# this causes it to generate its own implementations of +# standard functionality. regex.c actually breaks compilation +# because it uses __mempcpy, there are other things (TBD: +# see diffutils.mk in buildroot) +EXTRA_OECONF_linux-uclibc = "--without-included-regex" diff --git a/packages/findutils/findutils_4.1.20.bb b/packages/findutils/findutils_4.1.20.bb deleted file mode 100644 index 0ea93f44d3..0000000000 --- a/packages/findutils/findutils_4.1.20.bb +++ /dev/null @@ -1,30 +0,0 @@ -SECTION = "console/utils" -LICENSE = "GPL" -DESCRIPTION = "find, locate, and xargs binaries." -PR = "r3" - -SRC_URI = "ftp://alpha.gnu.org/gnu/findutils/findutils-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://make.patch;patch=1" - -inherit autotools gettext - -# diffutils assumes non-glibc compilation with uclibc and -# this causes it to generate its own implementations of -# standard functionality. regex.c actually breaks compilation -# because it uses __mempcpy, there are other things (TBD: -# see diffutils.mk in buildroot) -EXTRA_OECONF_linux-uclibc = "--without-included-regex" - -do_install_append () { - mv ${D}${bindir}/find ${D}${bindir}/find.${PN} - mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN} -} - -pkg_postinst_${PN} () { - for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done -} - -pkg_prerm_${PN} () { - for i in find xargs; do update-alternatives --remove $i $i.${PN}; done -} diff --git a/packages/findutils/findutils_4.2.29.bb b/packages/findutils/findutils_4.2.29.bb new file mode 100644 index 0000000000..2f40d03bd4 --- /dev/null +++ b/packages/findutils/findutils_4.2.29.bb @@ -0,0 +1,14 @@ +require findutils.inc + +do_install_append () { + mv ${D}${bindir}/find ${D}${bindir}/find.${PN} + mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN} +} + +pkg_postinst_${PN} () { + for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done +} + +pkg_prerm_${PN} () { + for i in find xargs; do update-alternatives --remove $i $i.${PN}; done +} -- cgit 1.2.3-korg