summaryrefslogtreecommitdiff
path: root/mk/configure
diff options
context:
space:
mode:
authorrillig <rillig>2006-11-05 07:41:06 +0000
committerrillig <rillig>2006-11-05 07:41:06 +0000
commita148d2834d0a01dd049a1d2497d05c729f76da29 (patch)
treeaf5232c141014a72e1e834a53cb0a74787550d1a /mk/configure
parentf5acdae512c9b7133be86f54e00f1ba790c28781 (diff)
downloadpkgsrc-a148d2834d0a01dd049a1d2497d05c729f76da29.tar.gz
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 (limited to 'mk/configure')
-rw-r--r--mk/configure/config-override.mk6
-rw-r--r--mk/configure/libtool-override.mk10
2 files changed, 8 insertions, 8 deletions
diff --git a/mk/configure/config-override.mk b/mk/configure/config-override.mk
index e5975a088dd..0f86819404a 100644
--- a/mk/configure/config-override.mk
+++ b/mk/configure/config-override.mk
@@ -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 @@ config-${_sub_}-override:
${_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 @@ config-${_sub_}-override:
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 --git a/mk/configure/libtool-override.mk b/mk/configure/libtool-override.mk
index 58684f7c658..32401e0e957 100644
--- a/mk/configure/libtool-override.mk
+++ b/mk/configure/libtool-override.mk
@@ -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 @@ libtool-override:
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 @@ libtool-override:
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 @@ shlibtool-override:
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 @@ shlibtool-override:
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"; \