Date: Mon, 17 Jun 2019 20:52:16 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504435 - head/devel/llvm80 Message-ID: <201906172052.x5HKqGsJ023310@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Mon Jun 17 20:52:15 2019 New Revision: 504435 URL: https://svnweb.freebsd.org/changeset/ports/504435 Log: 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] MFH: 2019Q2 Modified: head/devel/llvm80/Makefile head/devel/llvm80/distinfo Modified: head/devel/llvm80/Makefile ============================================================================== --- head/devel/llvm80/Makefile Mon Jun 17 20:48:37 2019 (r504434) +++ head/devel/llvm80/Makefile Mon Jun 17 20:52:15 2019 (r504435) @@ -4,7 +4,11 @@ PORTNAME= llvm DISTVERSION= 8.0.0 PORTREVISION= 2 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} @@ -417,7 +419,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: head/devel/llvm80/distinfo ============================================================================== --- head/devel/llvm80/distinfo Mon Jun 17 20:48:37 2019 (r504434) +++ head/devel/llvm80/distinfo Mon Jun 17 20:52:15 2019 (r504435) @@ -1,15 +1,15 @@ -TIMESTAMP = 1553104154 -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 -SIZE (cfe-8.0.0.src.tar.xz) = 12868468 -SHA256 (compiler-rt-8.0.0.src.tar.xz) = b435c7474f459e71b2831f1a4e3f1d21203cb9c0172e94e9d9b69f50354f21b1 -SIZE (compiler-rt-8.0.0.src.tar.xz) = 1903020 -SHA256 (clang-tools-extra-8.0.0.src.tar.xz) = 4f00122be408a7482f2004bcf215720d2b88cf8dc78b824abb225da8ad359d4b -SIZE (clang-tools-extra-8.0.0.src.tar.xz) = 1996156 -SHA256 (lld-8.0.0.src.tar.xz) = 9caec8ec922e32ffa130f0fb08e4c5a242d7e68ce757631e425e9eba2e1a6e37 -SIZE (lld-8.0.0.src.tar.xz) = 999864 -SHA256 (lldb-8.0.0.src.tar.xz) = 49918b9f09816554a20ac44c5f85a32dc0a7a00759b3259e78064d674eac0373 -SIZE (lldb-8.0.0.src.tar.xz) = 19602332 -SHA256 (openmp-8.0.0.src.tar.xz) = f7b1705d2f16c4fc23d6531f67d2dd6fb78a077dd346b02fed64f4b8df65c9d5 -SIZE (openmp-8.0.0.src.tar.xz) = 934384 +TIMESTAMP = 1560791803 +SHA256 (llvm-8.0.1rc2.src.tar.xz) = 97a5311ba0ee12d5b66174fd83efcfe5eee04344e91704b50a37221cd1977d36 +SIZE (llvm-8.0.1rc2.src.tar.xz) = 30480996 +SHA256 (cfe-8.0.1rc2.src.tar.xz) = 356e057a2fff03981a257fad9cab2eb740aaa78a804055ccc310a8f04c705dfe +SIZE (cfe-8.0.1rc2.src.tar.xz) = 12840164 +SHA256 (compiler-rt-8.0.1rc2.src.tar.xz) = 75b5ba07129466b45075f388d6d5d0f90e5aa47f9510544443306f84b4cc6bf6 +SIZE (compiler-rt-8.0.1rc2.src.tar.xz) = 1903552 +SHA256 (clang-tools-extra-8.0.1rc2.src.tar.xz) = e358a4c8a871097bd9e44fa7eba415551b65838b3b8ead484de8a6f5b61ac478 +SIZE (clang-tools-extra-8.0.1rc2.src.tar.xz) = 1994636 +SHA256 (lld-8.0.1rc2.src.tar.xz) = 3be439c1b5e3128d340156385031933c8e7288c10ba9930696bab8a21f78309b +SIZE (lld-8.0.1rc2.src.tar.xz) = 997700 +SHA256 (lldb-8.0.1rc2.src.tar.xz) = 8e9708e0363eb897dade32279849e0a6323e890d95bacf8a09e252e0547bfcb7 +SIZE (lldb-8.0.1rc2.src.tar.xz) = 19604960 +SHA256 (openmp-8.0.1rc2.src.tar.xz) = 9274743e8b69f8dc5f3f5bf5d0463050d047bf897c0781dbf77ac8608c1b4d23 +SIZE (openmp-8.0.1rc2.src.tar.xz) = 934920
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906172052.x5HKqGsJ023310>