svn commit: r504489 - branches/2019Q2/devel/llvm80
Brooks Davis
brooks at FreeBSD.org
Tue Jun 18 17:46:43 UTC 2019
Author: brooks
Date: Tue Jun 18 17:46:41 2019
New Revision: 504489
URL: https://svnweb.freebsd.org/changeset/ports/504489
Log:
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 at burggraben.net>
Approved by: portmgr (blanket fixes)
Modified:
branches/2019Q2/devel/llvm80/Makefile
branches/2019Q2/devel/llvm80/distinfo
Directory Properties:
branches/2019Q2/ (props changed)
Modified: branches/2019Q2/devel/llvm80/Makefile
==============================================================================
--- branches/2019Q2/devel/llvm80/Makefile Tue Jun 18 15:57:10 2019 (r504488)
+++ branches/2019Q2/devel/llvm80/Makefile Tue Jun 18 17:46:41 2019 (r504489)
@@ -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*}
Modified: branches/2019Q2/devel/llvm80/distinfo
==============================================================================
--- branches/2019Q2/devel/llvm80/distinfo Tue Jun 18 15:57:10 2019 (r504488)
+++ branches/2019Q2/devel/llvm80/distinfo Tue Jun 18 17:46:41 2019 (r504489)
@@ -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
More information about the svn-ports-all
mailing list