aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobik <tobik@FreeBSD.org>2018-03-31 11:28:42 +0800
committertobik <tobik@FreeBSD.org>2018-03-31 11:28:42 +0800
commitd88eff0b035d7f8fdf2c5d54a8b7c0509398d62c (patch)
tree4f46a268e59d3f4fa30cffdf5d4402ec6ec929cb
parent52078fba00417bae42ad10cce9f59071c73b5208 (diff)
downloadfreebsd-ports-gnome-d88eff0b035d7f8fdf2c5d54a8b7c0509398d62c.tar.gz
freebsd-ports-gnome-d88eff0b035d7f8fdf2c5d54a8b7c0509398d62c.tar.zst
freebsd-ports-gnome-d88eff0b035d7f8fdf2c5d54a8b7c0509398d62c.zip
devel/llvm*: Fix wrapper scripts to support symlinking to them
The wrapper scripts currently do not resolve the real path to $0: $ install -l rs /usr/local/bin/clang50 gcc $ ./gcc ./gcc: /usr/local/llvm50/bin/gcc: not found Here /usr/local/llvm50/bin/clang should be called not /usr/local/llvm50/bin/gcc. Approved by: brooks (maintainer) Differential Revision: https://reviews.freebsd.org/D14727
Diffstat
-rw-r--r--devel/llvm-cheri/Makefile1
-rw-r--r--devel/llvm-cheri/files/llvm-wrapper.sh.in3
-rw-r--r--devel/llvm33/Makefile2
-rw-r--r--devel/llvm33/files/llvm-wrapper.sh.in3
-rw-r--r--devel/llvm34/Makefile2
-rw-r--r--devel/llvm34/files/llvm-wrapper.sh.in3
-rw-r--r--devel/llvm35/Makefile2
-rw-r--r--devel/llvm35/files/llvm-wrapper.sh.in3
-rw-r--r--devel/llvm38/Makefile2
-rw-r--r--devel/llvm38/files/llvm-wrapper.sh.in3
-rw-r--r--devel/llvm39/Makefile2
-rw-r--r--devel/llvm39/files/llvm-wrapper.sh.in3
-rw-r--r--devel/llvm40/Makefile2
-rw-r--r--devel/llvm40/files/llvm-wrapper.sh.in3
-rw-r--r--devel/llvm50/Makefile2
-rw-r--r--devel/llvm50/files/llvm-wrapper.sh.in3
-rw-r--r--devel/llvm60/Makefile2
-rw-r--r--devel/llvm60/files/llvm-wrapper.sh.in3
18 files changed, 27 insertions, 17 deletions
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index e71f2553d3e1..afd2f3b5f188 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -2,6 +2,7 @@
PORTNAME= llvm
PORTVERSION= ${LLVM_MAJOR}.d${SNAPDATE}
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= ${LLVM_SUFFIX}
diff --git a/devel/llvm-cheri/files/llvm-wrapper.sh.in b/devel/llvm-cheri/files/llvm-wrapper.sh.in
index 0a460f3156e5..509dbe74a6b0 100644
--- a/devel/llvm-cheri/files/llvm-wrapper.sh.in
+++ b/devel/llvm-cheri/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
LLVM_PREFIX="%%LLVM_PREFIX%%"
LLVM_SUFFIX="%%LLVM_SUFFIX%%"
-tool=$(basename $0)
+tool=$(/bin/realpath $0)
+tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile
index c652e97b722c..90f85c09d3fb 100644
--- a/devel/llvm33/Makefile
+++ b/devel/llvm33/Makefile
@@ -2,7 +2,7 @@
PORTNAME= llvm
PORTVERSION= 3.3
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel lang
MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
diff --git a/devel/llvm33/files/llvm-wrapper.sh.in b/devel/llvm33/files/llvm-wrapper.sh.in
index 0a460f3156e5..509dbe74a6b0 100644
--- a/devel/llvm33/files/llvm-wrapper.sh.in
+++ b/devel/llvm33/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
LLVM_PREFIX="%%LLVM_PREFIX%%"
LLVM_SUFFIX="%%LLVM_SUFFIX%%"
-tool=$(basename $0)
+tool=$(/bin/realpath $0)
+tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile
index 0438cf05924e..4b1d62d5b620 100644
--- a/devel/llvm34/Makefile
+++ b/devel/llvm34/Makefile
@@ -2,7 +2,7 @@
PORTNAME= llvm
PORTVERSION= 3.4.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel lang
MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
diff --git a/devel/llvm34/files/llvm-wrapper.sh.in b/devel/llvm34/files/llvm-wrapper.sh.in
index 0a460f3156e5..509dbe74a6b0 100644
--- a/devel/llvm34/files/llvm-wrapper.sh.in
+++ b/devel/llvm34/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
LLVM_PREFIX="%%LLVM_PREFIX%%"
LLVM_SUFFIX="%%LLVM_SUFFIX%%"
-tool=$(basename $0)
+tool=$(/bin/realpath $0)
+tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile
index 383d45f7a812..34784c4e2fa6 100644
--- a/devel/llvm35/Makefile
+++ b/devel/llvm35/Makefile
@@ -2,7 +2,7 @@
PORTNAME= llvm
DISTVERSION= 3.5.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel lang
MASTER_SITES= http://llvm.org/releases/3.5.2/
DISTNAME= ${PORTNAME}-${DISTVERSION}.src
diff --git a/devel/llvm35/files/llvm-wrapper.sh.in b/devel/llvm35/files/llvm-wrapper.sh.in
index 0a460f3156e5..509dbe74a6b0 100644
--- a/devel/llvm35/files/llvm-wrapper.sh.in
+++ b/devel/llvm35/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
LLVM_PREFIX="%%LLVM_PREFIX%%"
LLVM_SUFFIX="%%LLVM_SUFFIX%%"
-tool=$(basename $0)
+tool=$(/bin/realpath $0)
+tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile
index a10874b1bd1a..1c7d6d44275b 100644
--- a/devel/llvm38/Makefile
+++ b/devel/llvm38/Makefile
@@ -2,7 +2,7 @@
PORTNAME= llvm
DISTVERSION= 3.8.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel lang
MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
DISTNAME= ${PORTNAME}-${DISTVERSION}.src
diff --git a/devel/llvm38/files/llvm-wrapper.sh.in b/devel/llvm38/files/llvm-wrapper.sh.in
index 0a460f3156e5..509dbe74a6b0 100644
--- a/devel/llvm38/files/llvm-wrapper.sh.in
+++ b/devel/llvm38/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
LLVM_PREFIX="%%LLVM_PREFIX%%"
LLVM_SUFFIX="%%LLVM_SUFFIX%%"
-tool=$(basename $0)
+tool=$(/bin/realpath $0)
+tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
diff --git a/devel/llvm39/Makefile b/devel/llvm39/Makefile
index 6f10d86477f2..da4743e04f8b 100644
--- a/devel/llvm39/Makefile
+++ b/devel/llvm39/Makefile
@@ -2,7 +2,7 @@
PORTNAME= llvm
DISTVERSION= 3.9.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel lang
MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
PKGNAMESUFFIX= ${LLVM_SUFFIX}
diff --git a/devel/llvm39/files/llvm-wrapper.sh.in b/devel/llvm39/files/llvm-wrapper.sh.in
index 0a460f3156e5..509dbe74a6b0 100644
--- a/devel/llvm39/files/llvm-wrapper.sh.in
+++ b/devel/llvm39/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
LLVM_PREFIX="%%LLVM_PREFIX%%"
LLVM_SUFFIX="%%LLVM_SUFFIX%%"
-tool=$(basename $0)
+tool=$(/bin/realpath $0)
+tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
diff --git a/devel/llvm40/Makefile b/devel/llvm40/Makefile
index 56c725b5c3ab..9c566bb3d950 100644
--- a/devel/llvm40/Makefile
+++ b/devel/llvm40/Makefile
@@ -2,7 +2,7 @@
PORTNAME= llvm
DISTVERSION= 4.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel lang
MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
PKGNAMESUFFIX= ${LLVM_SUFFIX}
diff --git a/devel/llvm40/files/llvm-wrapper.sh.in b/devel/llvm40/files/llvm-wrapper.sh.in
index 0a460f3156e5..509dbe74a6b0 100644
--- a/devel/llvm40/files/llvm-wrapper.sh.in
+++ b/devel/llvm40/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
LLVM_PREFIX="%%LLVM_PREFIX%%"
LLVM_SUFFIX="%%LLVM_SUFFIX%%"
-tool=$(basename $0)
+tool=$(/bin/realpath $0)
+tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
diff --git a/devel/llvm50/Makefile b/devel/llvm50/Makefile
index a2e7a30eb89c..e0f2ad1a02ef 100644
--- a/devel/llvm50/Makefile
+++ b/devel/llvm50/Makefile
@@ -2,7 +2,7 @@
PORTNAME= llvm
DISTVERSION= 5.0.1
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
MASTER_SITES= https://releases.llvm.org/${LLVM_RELEASE}/${RCDIR} LOCAL/brooks
PKGNAMESUFFIX= ${LLVM_SUFFIX}
diff --git a/devel/llvm50/files/llvm-wrapper.sh.in b/devel/llvm50/files/llvm-wrapper.sh.in
index 0a460f3156e5..509dbe74a6b0 100644
--- a/devel/llvm50/files/llvm-wrapper.sh.in
+++ b/devel/llvm50/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
LLVM_PREFIX="%%LLVM_PREFIX%%"
LLVM_SUFFIX="%%LLVM_SUFFIX%%"
-tool=$(basename $0)
+tool=$(/bin/realpath $0)
+tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
diff --git a/devel/llvm60/Makefile b/devel/llvm60/Makefile
index 201251cea19a..67e4571a5121 100644
--- a/devel/llvm60/Makefile
+++ b/devel/llvm60/Makefile
@@ -2,7 +2,7 @@
PORTNAME= llvm
DISTVERSION= 6.0.0
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
PKGNAMESUFFIX= ${LLVM_SUFFIX}
diff --git a/devel/llvm60/files/llvm-wrapper.sh.in b/devel/llvm60/files/llvm-wrapper.sh.in
index bf15174f746e..509dbe74a6b0 100644
--- a/devel/llvm60/files/llvm-wrapper.sh.in
+++ b/devel/llvm60/files/llvm-wrapper.sh.in
@@ -4,7 +4,8 @@
LLVM_PREFIX="%%LLVM_PREFIX%%"
LLVM_SUFFIX="%%LLVM_SUFFIX%%"
-tool=${0##*/}
+tool=$(/bin/realpath $0)
+tool=${tool##*/}
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
generated by cgit (git 2.34.1) at 2024-11-14 01:43:21 +0800