Date: Wed, 29 Jul 2015 14:32:26 +0200 From: Mathieu Arnold <mat@FreeBSD.org> To: Jan Beich <jbeich@FreeBSD.org>, Brooks Davis <brooks@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r392851 - in head: . devel devel/libiomp5-devel devel/llvm-devel devel/llvm-devel/files lang/clang-devel lang/clang-devel/files Message-ID: <D282422FA752A607C13D74CF@ogg.in.absolight.net> In-Reply-To: <bnev-1m1v-wny@FreeBSD.org> References: <201507242340.t6ONeAKs093826@repo.freebsd.org> <bnev-1m1v-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--==========B40754F31F386C57F330========== Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline +--On 29 juillet 2015 09:05:00 +0200 Jan Beich <jbeich@FreeBSD.org> wrote: | Brooks Davis <brooks@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@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 --==========B40754F31F386C57F330========== Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQJ8BAEBCgBmBQJVuMfaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IKQYP/1J8uPRyVnmfH6pwoubvRwXt eTGjEeqMwD2NpsLHGFbsaXB9DR9nZE6O1S7VSgs4Q06vCwUI2eDj7CdRUzD1+n6y mZytvfQQjOQy0Y5c/X4hqDdO8/96cn9yACokNNkafB+0XZjp5OQ6VRTv8OfltoYL oTuCvrkxG6pMukH8F+XIuGiMkoyC+2utayIejhN2sBi7dEBl2XNES1eZig5G2dPr a6LzOh4VIofwT/X8cDdKg4SnWihNY0AprB49FlkIFnP2QTTTx4KB7+ahHQrCh8e9 +gOhCsYZFwutqjVn8vCoCuF0arrEj3PCHzbKlBicTQWWR8vkSP5WERgL3z7r7uw+ od8v29MzwK8jY/0ayImCQmlh6hIXzCplZs5a+vRw3y8XMjy2m2SE2Z8tHdyQisFm a78V9JWvwe9N05N/CHvIN2eYtalq2H4vCXc9/XLsr06X3OawSF/gixjKpmuU7Gz+ VNfxkC7QrpIB6pULPHEJqJAosktZRPHOehGliCsOmrgoXn8nmBXxAV/giwz5SCNt Q0jz9Ib2ogVyhI6pZ76MzDpr/TfAsiNma/hnPi8O2/9znCDPZNuRIUFCo/fJxKhm EHj01bGeYntBjD61CMMFbZT3wUyPml6Hig7A70t4OHy+/J/4R1OqtOhmj+Ewlp9F 8YzbwZJNWkGYrFE+CSL2 =itr5 -----END PGP SIGNATURE----- --==========B40754F31F386C57F330==========--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D282422FA752A607C13D74CF>