| Message ID | 1331315349-8541-1-git-send-email-computersforpeace@gmail.com |
|---|---|
| State | Accepted |
| Commit | 424050cf57f797d635059b18ba6b8591c3fc126f |
| Headers | show |
On Fri, Mar 9, 2012 at 12:49, Brian Norris <computersforpeace@gmail.com> wrote: > findutils v4.1.x does not have the `-exec CMD {} +' syntax. We can just as > easily use the `-exec CMD {} \;' syntax. However, it will launch a lot more > `rm' processes, so we only use it if the first form fails with an error. > This isn't a perfect solution (`find -exec +' can fail for other reasons) > but it works well enough. > > This problem manifests itself in RHEL 4, findutils 4.1.20: Acked-by: Mike Frysinger <vapier@gentoo.org> -mike
On Fri, 2012-03-09 at 09:49 -0800, Brian Norris wrote: > findutils v4.1.x does not have the `-exec CMD {} +' syntax. We can just as > easily use the `-exec CMD {} \;' syntax. However, it will launch a lot more > `rm' processes, so we only use it if the first form fails with an error. > This isn't a perfect solution (`find -exec +' can fail for other reasons) > but it works well enough. > > This problem manifests itself in RHEL 4, findutils 4.1.20: Pushed, thanks you!
diff --git a/Makefile b/Makefile index 17a1216..7506ed4 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,8 @@ OBJDEPS = $(BUILDDIR)/include/version.h include common.mk +CLEAN_FIND = find "$(BUILDDIR)/" -xdev '(' -name '*.[ao]' -o -name '.*.c.dep' ')' + clean:: ifneq ($(BUILDDIR)/.git,) ifneq ($(BUILDDIR),.) @@ -50,10 +52,10 @@ ifneq ($(BUILDDIR),$(CURDIR)) endif endif endif + # findutils v4.1.x (RHEL 4) do not have '+' syntax @if test -d "$(BUILDDIR)/"; then \ - find $(BUILDDIR)/ -xdev \ - '(' -name '*.[ao]' -o -name '.*.c.dep' ')' \ - -exec rm -f {} + ; \ + $(CLEAN_FIND) -exec rm -f {} + 2> /dev/null || \ + $(CLEAN_FIND) -exec rm -f {} \; ; \ fi rm -f $(BUILDDIR)/include/version.h $(MAKE) -C $(TESTS) clean
findutils v4.1.x does not have the `-exec CMD {} +' syntax. We can just as easily use the `-exec CMD {} \;' syntax. However, it will launch a lot more `rm' processes, so we only use it if the first form fails with an error. This isn't a perfect solution (`find -exec +' can fail for other reasons) but it works well enough. This problem manifests itself in RHEL 4, findutils 4.1.20: $ make clean rm -f /XXX/mtd-utils/*.o /XXX/mtd-utils/ftl_format ... find: missing argument to `-exec' make: *** [clean] Error 1 Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Mike Frysinger <vapier.adi@gmail.com> --- v2: try '+' syntax, then fall back to old format Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)