diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2002-07-15 07:17:24 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2002-07-15 07:17:24 +0000 |
| commit | 7b57f8493501189c1a04a01803fc2c6c7426114f (patch) | |
| tree | 0053287c0b68c2a79d2cfb97df2fb5a58f267940 | |
| parent | Reflect devel/newt's shlib version bump from 0.50 to 50. (diff) | |
Remove unintentional dependency on readlink by replacing the call to it
with a piece of sh+awk based on a recent post to freebsd-arch by
Cyrille Lefevre <cyrille.lefevre@laposte.net>.
Notes
Notes:
svn path=/head/; revision=62964
| -rw-r--r-- | java/jdk13/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk14/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk15/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk16/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index a6c683ac8c20..1c74eb0f8619 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -123,7 +123,7 @@ pre-patch: pre-build: @if [ "$${WRKDIRPREFIX}" -a \ -L "/compat/linux/$${WRKDIRPREFIX}" -a \ - x`readlink "/compat/linux/$${WRKDIRPREFIX}"` = x"$${WRKDIRPREFIX}" ]; \ + x`ls -ld "/compat/linux/$${WRKDIRPREFIX}" 2>/dev/null | awk '/->/{print $$NF;exit 0}END{exit 1}'` = x"$${WRKDIRPREFIX}" ]; \ then \ echo "Please set WRKDIRPREFIX to something which doesn't"; \ echo "have a matching symbolic link in /compat/linux."; \ diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index a6c683ac8c20..1c74eb0f8619 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -123,7 +123,7 @@ pre-patch: pre-build: @if [ "$${WRKDIRPREFIX}" -a \ -L "/compat/linux/$${WRKDIRPREFIX}" -a \ - x`readlink "/compat/linux/$${WRKDIRPREFIX}"` = x"$${WRKDIRPREFIX}" ]; \ + x`ls -ld "/compat/linux/$${WRKDIRPREFIX}" 2>/dev/null | awk '/->/{print $$NF;exit 0}END{exit 1}'` = x"$${WRKDIRPREFIX}" ]; \ then \ echo "Please set WRKDIRPREFIX to something which doesn't"; \ echo "have a matching symbolic link in /compat/linux."; \ diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index a6c683ac8c20..1c74eb0f8619 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -123,7 +123,7 @@ pre-patch: pre-build: @if [ "$${WRKDIRPREFIX}" -a \ -L "/compat/linux/$${WRKDIRPREFIX}" -a \ - x`readlink "/compat/linux/$${WRKDIRPREFIX}"` = x"$${WRKDIRPREFIX}" ]; \ + x`ls -ld "/compat/linux/$${WRKDIRPREFIX}" 2>/dev/null | awk '/->/{print $$NF;exit 0}END{exit 1}'` = x"$${WRKDIRPREFIX}" ]; \ then \ echo "Please set WRKDIRPREFIX to something which doesn't"; \ echo "have a matching symbolic link in /compat/linux."; \ diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index a6c683ac8c20..1c74eb0f8619 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -123,7 +123,7 @@ pre-patch: pre-build: @if [ "$${WRKDIRPREFIX}" -a \ -L "/compat/linux/$${WRKDIRPREFIX}" -a \ - x`readlink "/compat/linux/$${WRKDIRPREFIX}"` = x"$${WRKDIRPREFIX}" ]; \ + x`ls -ld "/compat/linux/$${WRKDIRPREFIX}" 2>/dev/null | awk '/->/{print $$NF;exit 0}END{exit 1}'` = x"$${WRKDIRPREFIX}" ]; \ then \ echo "Please set WRKDIRPREFIX to something which doesn't"; \ echo "have a matching symbolic link in /compat/linux."; \ |