svn commit: r393204 - head/devel/llvm-devel
Brooks Davis
brooks at FreeBSD.org
Wed Jul 29 23:28:37 UTC 2015
Author: brooks
Date: Wed Jul 29 23:28:35 2015
New Revision: 393204
URL: https://svnweb.freebsd.org/changeset/ports/393204
Log:
Switch to USE_GITHUB's multiple project support.
Hack around the lack of <OPTION>_GH_PROJECT and <OPTION>_GH_TAGNAME support.
Submitted by: jbeich, mat
Modified:
head/devel/llvm-devel/Makefile
head/devel/llvm-devel/distinfo
Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile Wed Jul 29 22:57:36 2015 (r393203)
+++ head/devel/llvm-devel/Makefile Wed Jul 29 23:28:35 2015 (r393204)
@@ -5,13 +5,6 @@ PORTNAME= llvm
PORTVERSION= 3.8.d20150720
PORTREVISION= 3
CATEGORIES= devel lang
-MASTER_SITES= \
- http://github.com/llvm-mirror/llvm/archive/${LLVM_COMMIT}.tar.gz?dummy=/ \
- http://github.com/llvm-mirror/clang/archive/${CLANG_COMMIT}.tar.gz?dummy=/:clang \
- http://github.com/llvm-mirror/lld/archive/${LLD_COMMIT}.tar.gz?dummy=/:lld \
- http://github.com/llvm-mirror/lldb/archive/${LLDB_COMMIT}.tar.gz?dummy=/:lldb \
- http://github.com/llvm-mirror/openmp/archive/${OPENMP_COMMIT}.tar.gz?dummy=/:openmp
-DISTFILES= ${LLVM_NAME}.tar.gz
PKGNAMESUFFIX= -devel
MAINTAINER= brooks at FreeBSD.org
@@ -32,20 +25,16 @@ SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" L
CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX}
CMAKE_ARGS= -DBUILD_SHARED_LIBS=ON
+USE_GITHUB= yes
+GH_ACCOUNT= llvm-mirror
+GH_TAGNAME= ${LLVM_COMMIT}
+
LLVM_COMMIT= 4f50f9eba412b6c0d5e7a9616dfe7699a07cf17b
CLANG_COMMIT= dc9de2d1a510a8b7b95610d338e89f1f91d3ecdf
LLD_COMMIT= 3002cb875e292930a1a8f375f00b36abd1a4a83a
LLDB_COMMIT= 6160cbd3d3bcbbc409bf48a67ee097672256b03f
OPENMP_COMMIT= 50be853810d64cf7ba61a0ee7281ce82672af972
-LLVM_NAME= ${PORTNAME}-${LLVM_COMMIT}
-CLANG_NAME= clang-${CLANG_COMMIT}
-LLD_NAME= lld-${LLD_COMMIT}
-LLDB_NAME= lldb-${LLDB_COMMIT}
-OPENMP_NAME= openmp-${OPENMP_COMMIT}
-
-WRKSRC= ${WRKDIR}/${LLVM_NAME}
-
OPTIONS_DEFINE= CLANG DOCS LIT LLD LLDB
OPTIONS_DEFINE_amd64= OPENMP
OPTIONS_DEFAULT= CLANG LIT LLD LLDB
@@ -54,17 +43,21 @@ OPTIONS_SUB= yes
CLANG_DESC= Build clang
CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
-CLANG_DISTFILES= ${CLANG_NAME}.tar.gz:clang
CLANG_CONFLICTS_INSTALL= clang-devel-3.[1234567]*
+_CLANG_GH_PROJECT= clang:clang
+_CLANG_GH_TAGNAME= ${CLANG_COMMIT}:clang
LIT_DESC= Install lit and FileCheck test tools
LLD_DESC= Install lld, the LLVM linker
-LLD_DISTFILES= ${LLD_NAME}.tar.gz:lld
+_LLD_GH_PROJECT= lld:lld
+_LLD_GH_TAGNAME= ${LLD_COMMIT}:lld
LLDB_DESC= Install lldb, the LLVM debugger
LLDB_BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13
-LLDB_DISTFILES= ${LLDB_NAME}.tar.gz:lldb
+_LLDB_GH_PROJECT= lldb:lldb
+_LLDB_GH_TAGNAME= ${LLDB_COMMIT}:lldb
OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library
-OPENMP_DISTFILES= ${OPENMP_NAME}.tar.gz:openmp
OPENMP_CONFLICTS_INSTALL= libiomp5-devel-*
+_OPENMP_GH_PROJECT= openmp:openmp
+_OPENMP_GH_TAGNAME= ${OPENMP_COMMIT}:openmp
OPTIONS_SUB= yes
@@ -121,6 +114,8 @@ COMMANDS+= clang \
MAN1SRCS+= clang.1
PORTDOCS+= clang
CMAKE_ARGS+= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+GH_PROJECT+= ${_CLANG_GH_PROJECT}
+GH_TAGNAME+= ${_CLANG_GH_TAGNAME}
.endif
.if ${PORT_OPTIONS:MDOCS}
@@ -139,6 +134,8 @@ LIT_COMMANDS= lit llvm-lit FileCheck
.if ${PORT_OPTIONS:MLLD}
COMMANDS+= lld
PORTDOCS+= lld
+GH_PROJECT+= ${_LLD_GH_PROJECT}
+GH_TAGNAME+= ${_LLD_GH_TAGNAME}
.endif
.if ${PORT_OPTIONS:MLLDB}
@@ -147,10 +144,16 @@ COMMANDS+= argdumper \
lldb-mi \
lldb-server
_USES_PYTHON= python
+GH_PROJECT+= ${_LLDB_GH_PROJECT}
+GH_TAGNAME+= ${_LLDB_GH_TAGNAME}
.endif
.if ! ${OPTIONS_DEFINE:MOPENMP}
-PLIST_SUB+= OPENMP="@comment "
+# Hack to disable OPENMP in plist of unsupported architectures
+PLIST_SUB+= OPENMP="@comment "
+.else
+GH_PROJECT+= ${_OPENMP_GH_PROJECT}
+GH_TAGNAME+= ${_OPENMP_GH_TAGNAME}
.endif
_USES_PYTHON?= python:build
@@ -174,16 +177,16 @@ BROKEN= GCC failing on 8.x
post-extract:
.if ${PORT_OPTIONS:MCLANG}
- ${MV} ${WRKDIR}/${CLANG_NAME} ${PATCH_WRKSRC}/tools/clang
+ ${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
.endif
.if ${PORT_OPTIONS:MLLD}
- ${MV} ${WRKDIR}/${LLD_NAME} ${PATCH_WRKSRC}/tools/lld
+ ${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
.endif
.if ${PORT_OPTIONS:MLLDB}
- ${MV} ${WRKDIR}/${LLDB_NAME} ${PATCH_WRKSRC}/tools/lldb
+ ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
.endif
.if ${PORT_OPTIONS:MOPENMP}
- ${MV} ${WRKDIR}/${OPENMP_NAME} ${PATCH_WRKSRC}/tools/openmp
+ ${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp
.endif
post-patch:
Modified: head/devel/llvm-devel/distinfo
==============================================================================
--- head/devel/llvm-devel/distinfo Wed Jul 29 22:57:36 2015 (r393203)
+++ head/devel/llvm-devel/distinfo Wed Jul 29 23:28:35 2015 (r393204)
@@ -1,10 +1,10 @@
-SHA256 (llvm-4f50f9eba412b6c0d5e7a9616dfe7699a07cf17b.tar.gz) = ce2fba4ee4c5004a34fcec495b8608bed369d9f0e07811a84352167e48f91128
-SIZE (llvm-4f50f9eba412b6c0d5e7a9616dfe7699a07cf17b.tar.gz) = 21150084
-SHA256 (clang-dc9de2d1a510a8b7b95610d338e89f1f91d3ecdf.tar.gz) = 4f60a1df9f615957b3e78dd3a01f4f5594e26751a1b57191a5f8de222f969840
-SIZE (clang-dc9de2d1a510a8b7b95610d338e89f1f91d3ecdf.tar.gz) = 12426962
-SHA256 (lld-3002cb875e292930a1a8f375f00b36abd1a4a83a.tar.gz) = 7d67e9b48b9e68d0d822538042f895672af91d512dc60532b91c1d4948d9b809
-SIZE (lld-3002cb875e292930a1a8f375f00b36abd1a4a83a.tar.gz) = 797487
-SHA256 (lldb-6160cbd3d3bcbbc409bf48a67ee097672256b03f.tar.gz) = 87acf4295f4170744ddf9fae56a254de107cffc336c543f47d3870eac92e4bbb
-SIZE (lldb-6160cbd3d3bcbbc409bf48a67ee097672256b03f.tar.gz) = 13165011
-SHA256 (openmp-50be853810d64cf7ba61a0ee7281ce82672af972.tar.gz) = 912fe4a38e9d7aa1b348e719d9730aa14718dd59a964098cc7591f17be0284fe
-SIZE (openmp-50be853810d64cf7ba61a0ee7281ce82672af972.tar.gz) = 2814956
+SHA256 (llvm-mirror-llvm-3.8.d20150720-4f50f9eba412b6c0d5e7a9616dfe7699a07cf17b_GH0.tar.gz) = ce2fba4ee4c5004a34fcec495b8608bed369d9f0e07811a84352167e48f91128
+SIZE (llvm-mirror-llvm-3.8.d20150720-4f50f9eba412b6c0d5e7a9616dfe7699a07cf17b_GH0.tar.gz) = 21150084
+SHA256 (llvm-mirror-clang-dc9de2d1a510a8b7b95610d338e89f1f91d3ecdf_GH0.tar.gz) = 4f60a1df9f615957b3e78dd3a01f4f5594e26751a1b57191a5f8de222f969840
+SIZE (llvm-mirror-clang-dc9de2d1a510a8b7b95610d338e89f1f91d3ecdf_GH0.tar.gz) = 12426962
+SHA256 (llvm-mirror-lld-3002cb875e292930a1a8f375f00b36abd1a4a83a_GH0.tar.gz) = 7d67e9b48b9e68d0d822538042f895672af91d512dc60532b91c1d4948d9b809
+SIZE (llvm-mirror-lld-3002cb875e292930a1a8f375f00b36abd1a4a83a_GH0.tar.gz) = 797487
+SHA256 (llvm-mirror-lldb-6160cbd3d3bcbbc409bf48a67ee097672256b03f_GH0.tar.gz) = 87acf4295f4170744ddf9fae56a254de107cffc336c543f47d3870eac92e4bbb
+SIZE (llvm-mirror-lldb-6160cbd3d3bcbbc409bf48a67ee097672256b03f_GH0.tar.gz) = 13165011
+SHA256 (llvm-mirror-openmp-50be853810d64cf7ba61a0ee7281ce82672af972_GH0.tar.gz) = 912fe4a38e9d7aa1b348e719d9730aa14718dd59a964098cc7591f17be0284fe
+SIZE (llvm-mirror-openmp-50be853810d64cf7ba61a0ee7281ce82672af972_GH0.tar.gz) = 2814956
More information about the svn-ports-all
mailing list