[pkgsrc/trunk]: pkgsrc/mk/configure The config.guess, config.sub and libtool ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/14ada2deedc1
branches:  trunk
changeset: 521100:14ada2deedc1
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 05 07:41:06 2006 +0000

description:
The config.guess, config.sub and libtool files should also be
overwritten when the package-provided files are (possibly dead)
symlinks. Since on Mac OS X, ls(1) does not return the status I
expected, I investigated a little in the available options of test(1),
and found that the "-h" option should be quite portable. So let's try
that instead.

This fixes PR 34865.

diffstat:

 mk/configure/config-override.mk  |   6 +++---
 mk/configure/libtool-override.mk |  10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 1641c7867f68 -r 14ada2deedc1 mk/configure/config-override.mk
--- a/mk/configure/config-override.mk   Sun Nov 05 07:24:33 2006 +0000
+++ b/mk/configure/config-override.mk   Sun Nov 05 07:41:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: config-override.mk,v 1.3 2006/10/05 02:59:54 rillig Exp $
+# $NetBSD: config-override.mk,v 1.4 2006/11/05 07:41:06 rillig Exp $
 
 ######################################################################
 ### config-{guess,sub,rpath}-override (PRIVATE)
@@ -33,7 +33,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}set -e;                              \
        cd ${WRKSRC};                                                   \
        for file in ${${_OVERRIDE_VAR.${_sub_}}}; do                    \
-               ${TEST} -f "$$file" || continue;                        \
+               ${TEST} -f "$$file" || ${TEST} -h "$$file" || continue; \
                ${_SCRIPT.${.TARGET}};                                  \
        done
 .  else
@@ -42,7 +42,7 @@
        depth=0; pattern=config.${_sub_};                               \
        while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.config-${_sub_}}; do \
                for file in $$pattern; do                               \
-                       ${LS} "$$file" 1>/dev/null 2>&1 || continue;    \
+                       test -f "$$file" || test -h "$$file" || continue; \
                        ${_SCRIPT.${.TARGET}};                          \
                done;                                                   \
                depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern";     \
diff -r 1641c7867f68 -r 14ada2deedc1 mk/configure/libtool-override.mk
--- a/mk/configure/libtool-override.mk  Sun Nov 05 07:24:33 2006 +0000
+++ b/mk/configure/libtool-override.mk  Sun Nov 05 07:41:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-override.mk,v 1.7 2006/10/05 02:59:54 rillig Exp $
+# $NetBSD: libtool-override.mk,v 1.8 2006/11/05 07:41:06 rillig Exp $
 
 ######################################################################
 ### {libtool,shlibtool}-override (PRIVATE)
@@ -34,7 +34,7 @@
        set -- dummy ${LIBTOOL_OVERRIDE}; shift;                        \
        while ${TEST} $$# -gt 0; do                                     \
                file="$$1"; shift;                                      \
-               ${TEST} -f "$$file" || continue;                        \
+               [ -f "$$file" ] || [ -h "$$file" ] || continue;         \
                ${_SCRIPT.${.TARGET}};                                  \
        done
 .else
@@ -43,7 +43,7 @@
        depth=0; pattern=libtool;                                       \
        while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.libtool}; do      \
                for file in $$pattern; do                               \
-                       ${LS} "$$file" 1>/dev/null 2>&1 || continue;    \
+                       [ -f "$$file" ] || [ -h "$$file" ] || continue; \
                        ${_SCRIPT.${.TARGET}};                          \
                done;                                                   \
                depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern";     \
@@ -59,7 +59,7 @@
        set -- dummy ${SHLIBTOOL_OVERRIDE}; shift;                      \
        while ${TEST} $$# -gt 0; do                                     \
                file="$$1"; shift;                                      \
-               ${TEST} -f "$$file" || continue;                        \
+               [ -f "$$file" ] || [ -h "$$file" ] || continue;         \
                ${_SCRIPT.${.TARGET}};                                  \
        done
 .else
@@ -68,7 +68,7 @@
        depth=0; pattern=libtool;                                       \
        while ${TEST} $$depth -le ${OVERRIDE_DIRDEPTH.shlibtool}; do    \
                for file in $$pattern; do                               \
-                       ${TEST} -f "$$file" || continue;                \
+                       [ -f "$$file" ] || [ -h "$$file" ] || continue; \
                        ${_SCRIPT.${.TARGET}};                          \
                done;                                                   \
                depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern";     \