diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2019-06-18 17:46:41 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2019-06-18 17:46:41 +0000 |
| commit | a155c6e38967d30705ec05312ff1b32843853c4c (patch) | |
| tree | 1d6e7503e99be2cca190ec2317bffb11228cd0dd | |
| parent | e765f05a9e68ad510902ad49aa49613c8725e7c8 (diff) | |
| download | ports-a155c6e38967d30705ec05312ff1b32843853c4c.tar.gz ports-a155c6e38967d30705ec05312ff1b32843853c4c.zip | |
MFH: r504435 r504436
Fix a bug when ${PREFIX} != /usr/local.[0]
As of LLVM 8.0.1, pre-releases have moved to github. Chase this change.
PR: 238603 [0]
Submitted by: mi [0]
Revert accidental update to distinfo.
Reported by: Christoph Moench-Tegeder <cmt@burggraben.net>
Approved by: portmgr (blanket fixes)
Notes
Notes:
svn path=/branches/2019Q2/; revision=504489
| -rw-r--r-- | devel/llvm80/Makefile | 10 | ||||
| -rw-r--r-- | devel/llvm80/distinfo | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile index f77617166369..90168fd29e6e 100644 --- a/devel/llvm80/Makefile +++ b/devel/llvm80/Makefile @@ -4,7 +4,11 @@ PORTNAME= llvm DISTVERSION= 8.0.0 PORTREVISION= 0 CATEGORIES= devel lang -MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} +.if ${DISTVERSION:M*rc*} +MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_RELEASE}-${DISTVERSION:S/${LLVM_RELEASE}//}/ +.else +MASTER_SITES= http://releases.llvm.org/${LLVM_RELEASE}/ +.endif PKGNAMESUFFIX= ${LLVM_SUFFIX} DISTNAME= ${PORTNAME}-${DISTVERSION}.src DISTFILES= ${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX} @@ -16,8 +20,6 @@ COMMENT= LLVM and Clang LLVM_RELEASE= ${DISTVERSION:C/rc.*//} LLVM_MAJOR= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} -RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|} -PRE_= ${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*} LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]$//:C/\.//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} @@ -416,7 +418,7 @@ post-build-COMPILER_RT-on: post-install: ${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis - ${RMDIR} ${STAGEDIR}/usr/local/llvm80/include/llvm/TextAPI/MachO + ${RMDIR} ${STAGEDIR}/${PREFIX}/llvm80/include/llvm/TextAPI/MachO ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} diff --git a/devel/llvm80/distinfo b/devel/llvm80/distinfo index ca3ed014e908..d3df1842b1bb 100644 --- a/devel/llvm80/distinfo +++ b/devel/llvm80/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1553104154 +TIMESTAMP = 1560807021 SHA256 (llvm-8.0.0.src.tar.xz) = 8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c SIZE (llvm-8.0.0.src.tar.xz) = 30503732 SHA256 (cfe-8.0.0.src.tar.xz) = 084c115aab0084e63b23eee8c233abb6739c399e29966eaeccfc6e088e0b736b |