svn commit: r392851 - in head: . devel devel/libiomp5-devel devel/llvm-devel devel/llvm-devel/files lang/clang-devel lang/clang-devel/files
Mathieu Arnold
mat at FreeBSD.org
Wed Jul 29 12:32:32 UTC 2015
+--On 29 juillet 2015 09:05:00 +0200 Jan Beich <jbeich at FreeBSD.org> wrote:
| Brooks Davis <brooks at FreeBSD.org> writes:
|
|> Author: brooks
|> Date: Fri Jul 24 23:40:09 2015
|> New Revision: 392851
|> URL: https://svnweb.freebsd.org/changeset/ports/392851
|>
|> Log:
|> Mostly complete redo to the build of -devel LLVM ports:
|> - Switch to cmake.
|> - Combine all builds into devel/llvm-devel.
| [...]
|> -MASTER_SITES= LOCAL/brooks
|> +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/openmp/archive/${OPENMP_COMMIT}.tar.gz?dum
|> my=/:openmp +DISTFILES= ${LLVM_NAME}.tar.gz
| [...]
|> +LLVM_COMMIT= 4f50f9eba412b6c0d5e7a9616dfe7699a07cf17b
|> +CLANG_COMMIT= dc9de2d1a510a8b7b95610d338e89f1f91d3ecdf
|> +OPENMP_COMMIT= 50be853810d64cf7ba61a0ee7281ce82672af972
|>
|> -OPTIONS_DEFINE= ASSERTS CMAKE DOCS LIT LTOPLUGIN MANPAGES
|> +LLVM_NAME= ${PORTNAME}-${LLVM_COMMIT}
|> +CLANG_NAME= clang-${CLANG_COMMIT}
|> +OPENMP_NAME= openmp-${OPENMP_COMMIT}
|
| Why not use the feature described in /usr/ports/CHANGES at 20150528 ?
| The only downside is lack of option helpers. However, building ports
| already requires more bandwidth than using only packages thus DISTFILES
| can be made unconditional.
|
| See example below. It requires |make makesum| to get properly named
| distfiles, i.e. those with _GH0 suffix.
|
| Index: devel/llvm-devel/Makefile
| ===================================================================
| --- devel/llvm-devel/Makefile (revision 393142)
| +++ devel/llvm-devel/Makefile (working copy)
| @@ -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?dumm
| y=/:openmp -DISTFILES= ${LLVM_NAME}.tar.gz
| PKGNAMESUFFIX= -devel
|
| MAINTAINER= brooks at FreeBSD.org
| @@ -32,6 +25,12 @@ SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX
| CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX}
| CMAKE_ARGS= -DBUILD_SHARED_LIBS=ON
|
| +USE_GITHUB= yes
| +GH_ACCOUNT= llvm-mirror
| +GH_PROJECT= clang:clang lld:lld lldb:lldb openmp:openmp
| +GH_TAGNAME= ${LLVM_COMMIT} ${CLANG_COMMIT}:clang ${LLD_COMMIT}:lld \
| + ${LLDB_COMMIT}:lldb ${OPENMP_COMMIT}:openmp
As the DISTFILES are optional, things like this would be more appropriate:
LLD_GH_TAGNAME= ${LLD_COMMIT}:lld
But, yes, please, use the USE_GITHUB framework for this.
| LLVM_COMMIT= 4f50f9eba412b6c0d5e7a9616dfe7699a07cf17b
| CLANG_COMMIT= dc9de2d1a510a8b7b95610d338e89f1f91d3ecdf
| LLD_COMMIT= 3002cb875e292930a1a8f375f00b36abd1a4a83a
| @@ -38,14 +37,6 @@ LLD_COMMIT= 3002cb875e292930a1a8f375f00b36abd1a4a8
| 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,15 +45,11 @@ 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]*
| LIT_DESC= Install lit and FileCheck test tools
| LLD_DESC= Install lld, the LLVM linker
| -LLD_DISTFILES= ${LLD_NAME}.tar.gz:lld
| LLDB_DESC= Install lldb, the LLVM debugger
| -LLDB_DISTFILES= ${LLDB_NAME}.tar.gz:lldb
| OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library
| -OPENMP_DISTFILES= ${OPENMP_NAME}.tar.gz:openmp
| OPENMP_CONFLICTS_INSTALL= libiomp5-devel-*
|
| OPTIONS_SUB= yes
| @@ -173,16 +160,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:
--
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 949 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20150729/cfddd69e/attachment.bin>
More information about the svn-ports-head
mailing list