From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-qa0-x234.google.com ([2607:f8b0:400d:c00::234]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Xe9eU-0004VL-8j for ptxdist@pengutronix.de; Tue, 14 Oct 2014 23:29:06 +0200 Received: by mail-qa0-f52.google.com with SMTP id dc16so6370680qab.25 for ; Tue, 14 Oct 2014 14:28:59 -0700 (PDT) From: jon@ringle.org Date: Tue, 14 Oct 2014 17:28:50 -0400 Message-Id: <1413322130-9678-1-git-send-email-jon@ringle.org> Subject: [ptxdist] [PATCH] configure/Makefile: Check for touch --no-dereference support Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Jon Ringle From: Jon Ringle Install a wrapper touch that will strip --no-dereference from the args if the host installed touch does not support it Signed-off-by: Jon Ringle --- Makefile.in | 14 ++++++++++++++ configure.ac | 8 ++++++++ 2 files changed, 22 insertions(+) diff --git a/Makefile.in b/Makefile.in index 64dc808..5787699 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,6 +39,18 @@ kconfig: conf mconf $(NCONF) @echo "done." +define touch_wrapper +#!/bin/bash + +declare -a args +args=($${@}) + +[ -n "@TOUCH_NO_DEREFERENCE@" ] || args=($${@//--no-dereference/}) + +@GNU_touch@ $${args[*]} +endef +export touch_wrapper + environment: @echo -n "preparing PTXdist environment ..." @ln -sf @AWK@ "$(abs_srcdir)/bin/awk" @@ -69,6 +81,8 @@ environment: @ln -sf @BASH@ "$(abs_srcdir)/bin/bash" @ln -sf @SYSCTL@ "$(abs_srcdir)/bin/sysctl" @ln -sf @MAKE@ "$(abs_srcdir)/bin/make" + @echo "$$touch_wrapper" > "$(abs_srcdir)/bin/touch" + @chmod +x "$(abs_srcdir)/bin/touch" @echo " done" clean: diff --git a/configure.ac b/configure.ac index 22c8df0..5fed6c9 100644 --- a/configure.ac +++ b/configure.ac @@ -158,6 +158,7 @@ GNU_TOOL(sort, coreutils) GNU_TOOL(cat, coreutils) GNU_TOOL(tty, coreutils) GNU_TOOL(readlink, coreutils) +GNU_TOOL(touch, coreutils) GNU_TOOL(tar, tar) GNU_TOOL(find, findutils) GNU_TOOL(xargs, findutils) @@ -278,6 +279,13 @@ if test -z "$MSGFMT"; then AC_MSG_ERROR([gettext could not be found, please install]) fi +dnl Check for touch --no-dereference support +AC_CACHE_CHECK([for touch that supports --no-dereference], [ac_cv_path_TOUCH_NO_DEREFERENCE], + [AC_PATH_PROGS_FEATURE_CHECK([TOUCH_NO_DEREFERENCE], [touch], + [[$ac_path_TOUCH_NO_DEREFERENCE --no-dereference /dev/null 2> /dev/null && \ + ac_cv_path_TOUCH_NO_DEREFERENCE=$ac_path_TOUCH_NO_DEREFERENCE ac_path_TOUCH_NO_DEREFERENCE_found=:]])]) +AC_SUBST([TOUCH_NO_DEREFERENCE], [$ac_cv_path_TOUCH_NO_DEREFERENCE]) + dnl dnl Checks for Python, needed for ipkg-utils dnl -- 1.8.5.4 -- ptxdist mailing list ptxdist@pengutronix.de