svn commit: r466018 - in head/devel: llvm-cheri llvm-cheri/files llvm33 llvm33/files llvm34 llvm34/files llvm35 llvm35/files llvm38 llvm38/files llvm39 llvm39/files llvm40 llvm40/files llvm50 llvm5...
Tobias Kortkamp
tobik at FreeBSD.org
Sat Mar 31 03:28:45 UTC 2018
Author: tobik
Date: Sat Mar 31 03:28:42 2018
New Revision: 466018
URL: https://svnweb.freebsd.org/changeset/ports/466018
Log:
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
Modified:
head/devel/llvm-cheri/Makefile
head/devel/llvm-cheri/files/llvm-wrapper.sh.in
head/devel/llvm33/Makefile
head/devel/llvm33/files/llvm-wrapper.sh.in
head/devel/llvm34/Makefile
head/devel/llvm34/files/llvm-wrapper.sh.in
head/devel/llvm35/Makefile
head/devel/llvm35/files/llvm-wrapper.sh.in
head/devel/llvm38/Makefile
head/devel/llvm38/files/llvm-wrapper.sh.in
head/devel/llvm39/Makefile
head/devel/llvm39/files/llvm-wrapper.sh.in
head/devel/llvm40/Makefile
head/devel/llvm40/files/llvm-wrapper.sh.in
head/devel/llvm50/Makefile
head/devel/llvm50/files/llvm-wrapper.sh.in
head/devel/llvm60/Makefile
head/devel/llvm60/files/llvm-wrapper.sh.in
Modified: head/devel/llvm-cheri/Makefile
==============================================================================
--- head/devel/llvm-cheri/Makefile Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm-cheri/Makefile Sat Mar 31 03:28:42 2018 (r466018)
@@ -2,6 +2,7 @@
PORTNAME= llvm
PORTVERSION= ${LLVM_MAJOR}.d${SNAPDATE}
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= ${LLVM_SUFFIX}
Modified: head/devel/llvm-cheri/files/llvm-wrapper.sh.in
==============================================================================
--- head/devel/llvm-cheri/files/llvm-wrapper.sh.in Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm-cheri/files/llvm-wrapper.sh.in Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}" "${@}"
Modified: head/devel/llvm33/Makefile
==============================================================================
--- head/devel/llvm33/Makefile Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm33/Makefile Sat Mar 31 03:28:42 2018 (r466018)
@@ -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
Modified: head/devel/llvm33/files/llvm-wrapper.sh.in
==============================================================================
--- head/devel/llvm33/files/llvm-wrapper.sh.in Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm33/files/llvm-wrapper.sh.in Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}" "${@}"
Modified: head/devel/llvm34/Makefile
==============================================================================
--- head/devel/llvm34/Makefile Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm34/Makefile Sat Mar 31 03:28:42 2018 (r466018)
@@ -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
Modified: head/devel/llvm34/files/llvm-wrapper.sh.in
==============================================================================
--- head/devel/llvm34/files/llvm-wrapper.sh.in Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm34/files/llvm-wrapper.sh.in Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}" "${@}"
Modified: head/devel/llvm35/Makefile
==============================================================================
--- head/devel/llvm35/Makefile Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm35/Makefile Sat Mar 31 03:28:42 2018 (r466018)
@@ -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
Modified: head/devel/llvm35/files/llvm-wrapper.sh.in
==============================================================================
--- head/devel/llvm35/files/llvm-wrapper.sh.in Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm35/files/llvm-wrapper.sh.in Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}" "${@}"
Modified: head/devel/llvm38/Makefile
==============================================================================
--- head/devel/llvm38/Makefile Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm38/Makefile Sat Mar 31 03:28:42 2018 (r466018)
@@ -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
Modified: head/devel/llvm38/files/llvm-wrapper.sh.in
==============================================================================
--- head/devel/llvm38/files/llvm-wrapper.sh.in Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm38/files/llvm-wrapper.sh.in Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}" "${@}"
Modified: head/devel/llvm39/Makefile
==============================================================================
--- head/devel/llvm39/Makefile Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm39/Makefile Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}
Modified: head/devel/llvm39/files/llvm-wrapper.sh.in
==============================================================================
--- head/devel/llvm39/files/llvm-wrapper.sh.in Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm39/files/llvm-wrapper.sh.in Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}" "${@}"
Modified: head/devel/llvm40/Makefile
==============================================================================
--- head/devel/llvm40/Makefile Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm40/Makefile Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}
Modified: head/devel/llvm40/files/llvm-wrapper.sh.in
==============================================================================
--- head/devel/llvm40/files/llvm-wrapper.sh.in Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm40/files/llvm-wrapper.sh.in Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}" "${@}"
Modified: head/devel/llvm50/Makefile
==============================================================================
--- head/devel/llvm50/Makefile Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm50/Makefile Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}
Modified: head/devel/llvm50/files/llvm-wrapper.sh.in
==============================================================================
--- head/devel/llvm50/files/llvm-wrapper.sh.in Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm50/files/llvm-wrapper.sh.in Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}" "${@}"
Modified: head/devel/llvm60/Makefile
==============================================================================
--- head/devel/llvm60/Makefile Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm60/Makefile Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}
Modified: head/devel/llvm60/files/llvm-wrapper.sh.in
==============================================================================
--- head/devel/llvm60/files/llvm-wrapper.sh.in Sat Mar 31 00:37:44 2018 (r466017)
+++ head/devel/llvm60/files/llvm-wrapper.sh.in Sat Mar 31 03:28:42 2018 (r466018)
@@ -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}" "${@}"
More information about the svn-ports-all
mailing list