From owner-svn-ports-all@freebsd.org Wed Jul 29 07:05:50 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44DE19AD734 for ; Wed, 29 Jul 2015 07:05:50 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from vfemail.net (ninezero.vfemail.net [96.30.253.190]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBA50CE1 for ; Wed, 29 Jul 2015 07:05:49 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: (qmail 41417 invoked by uid 89); 29 Jul 2015 07:05:37 -0000 Received: from localhost (HELO freequeue.vfemail.net) (127.0.0.1) by localhost with (DHE-RSA-AES256-SHA encrypted) SMTP; 29 Jul 2015 07:05:37 -0000 Received: (qmail 41384 invoked by uid 89); 29 Jul 2015 07:05:20 -0000 Received: by simscan 1.3.1 ppid: 41374, pid: 41379, t: 0.0064s scanners:none Received: from unknown (HELO smtp102-2.vfemail.net) (172.16.100.62) by FreeQueue with SMTP; 29 Jul 2015 07:05:20 -0000 Received: (qmail 25426 invoked by uid 89); 29 Jul 2015 07:05:20 -0000 Received: by simscan 1.4.0 ppid: 25384, pid: 25408, t: 0.9050s scanners:none Received: from unknown (HELO nil) (amJlaWNoQHZmZW1haWwubmV0@172.16.100.27) by 172.16.100.62 with ESMTPA; 29 Jul 2015 07:05:19 -0000 From: Jan Beich To: Brooks Davis 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 References: <201507242340.t6ONeAKs093826@repo.freebsd.org> Date: Wed, 29 Jul 2015 09:05:00 +0200 In-Reply-To: <201507242340.t6ONeAKs093826@repo.freebsd.org> (Brooks Davis's message of "Fri, 24 Jul 2015 23:40:10 +0000 (UTC)") Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jul 2015 07:05:50 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Brooks Davis 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=3D LOCAL/brooks > +MASTER_SITES=3D \ > + http://github.com/llvm-mirror/llvm/archive/${LLVM_COMMIT}.tar.gz?dum= my=3D/ \ > + http://github.com/llvm-mirror/clang/archive/${CLANG_COMMIT}.tar.gz?d= ummy=3D/:clang \ > + http://github.com/llvm-mirror/openmp/archive/${OPENMP_COMMIT}.tar.gz= ?dummy=3D/:openmp > +DISTFILES=3D ${LLVM_NAME}.tar.gz [...] > +LLVM_COMMIT=3D 4f50f9eba412b6c0d5e7a9616dfe7699a07cf17b > +CLANG_COMMIT=3D dc9de2d1a510a8b7b95610d338e89f1f91d3ecdf > +OPENMP_COMMIT=3D 50be853810d64cf7ba61a0ee7281ce82672af972 >=20=20 > -OPTIONS_DEFINE=3D ASSERTS CMAKE DOCS LIT LTOPLUGIN MANPAGES > +LLVM_NAME=3D ${PORTNAME}-${LLVM_COMMIT} > +CLANG_NAME=3D clang-${CLANG_COMMIT} > +OPENMP_NAME=3D 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- devel/llvm-devel/Makefile (revision 393142) +++ devel/llvm-devel/Makefile (working copy) @@ -5,13 +5,6 @@ PORTNAME=3D llvm PORTVERSION=3D 3.8.d20150720 PORTREVISION=3D 3 CATEGORIES=3D devel lang =2DMASTER_SITES=3D \ =2D http://github.com/llvm-mirror/llvm/archive/${LLVM_COMMIT}.tar.gz?dum= my=3D/ \ =2D http://github.com/llvm-mirror/clang/archive/${CLANG_COMMIT}.tar.gz?d= ummy=3D/:clang \ =2D http://github.com/llvm-mirror/lld/archive/${LLD_COMMIT}.tar.gz?dummy= =3D/:lld =2D http://github.com/llvm-mirror/lldb/archive/${LLDB_COMMIT}.tar.gz?dum= my=3D/:lldb =2D http://github.com/llvm-mirror/openmp/archive/${OPENMP_COMMIT}.tar.gz= ?dummy=3D/:openmp =2DDISTFILES=3D ${LLVM_NAME}.tar.gz PKGNAMESUFFIX=3D -devel =20 MAINTAINER=3D brooks@FreeBSD.org @@ -32,6 +25,12 @@ SUB_LIST=3D LLVM_PREFIX=3D"${LLVM_PREFIX}" LLVM_SUFFIX CMAKE_INSTALL_PREFIX=3D ${LLVM_PREFIX} CMAKE_ARGS=3D -DBUILD_SHARED_LIBS=3DON =20 +USE_GITHUB=3D yes +GH_ACCOUNT=3D llvm-mirror +GH_PROJECT=3D clang:clang lld:lld lldb:lldb openmp:openmp +GH_TAGNAME=3D ${LLVM_COMMIT} ${CLANG_COMMIT}:clang ${LLD_COMMIT}:lld \ + ${LLDB_COMMIT}:lldb ${OPENMP_COMMIT}:openmp + LLVM_COMMIT=3D 4f50f9eba412b6c0d5e7a9616dfe7699a07cf17b CLANG_COMMIT=3D dc9de2d1a510a8b7b95610d338e89f1f91d3ecdf LLD_COMMIT=3D 3002cb875e292930a1a8f375f00b36abd1a4a83a @@ -38,14 +37,6 @@ LLD_COMMIT=3D 3002cb875e292930a1a8f375f00b36abd1a4a8 LLDB_COMMIT=3D 6160cbd3d3bcbbc409bf48a67ee097672256b03f OPENMP_COMMIT=3D 50be853810d64cf7ba61a0ee7281ce82672af972 =20 =2DLLVM_NAME=3D ${PORTNAME}-${LLVM_COMMIT} =2DCLANG_NAME=3D clang-${CLANG_COMMIT} =2DLLD_NAME=3D lld-${LLD_COMMIT} =2DLLDB_NAME=3D lldb-${LLDB_COMMIT} =2DOPENMP_NAME=3D openmp-${OPENMP_COMMIT} =2D =2DWRKSRC=3D ${WRKDIR}/${LLVM_NAME} =2D OPTIONS_DEFINE=3D CLANG DOCS LIT LLD LLDB OPTIONS_DEFINE_amd64=3D OPENMP OPTIONS_DEFAULT=3D CLANG LIT LLD LLDB @@ -54,15 +45,11 @@ OPTIONS_SUB=3D yes =20 CLANG_DESC=3D Build clang CLANG_EXTRA_PATCHES=3D ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMa= keLists.txt =2DCLANG_DISTFILES=3D ${CLANG_NAME}.tar.gz:clang CLANG_CONFLICTS_INSTALL=3D clang-devel-3.[1234567]* LIT_DESC=3D Install lit and FileCheck test tools LLD_DESC=3D Install lld, the LLVM linker =2DLLD_DISTFILES=3D ${LLD_NAME}.tar.gz:lld LLDB_DESC=3D Install lldb, the LLVM debugger =2DLLDB_DISTFILES=3D ${LLDB_NAME}.tar.gz:lldb OPENMP_DESC=3D Install libomp, the LLVM OpenMP runtime library =2DOPENMP_DISTFILES=3D ${OPENMP_NAME}.tar.gz:openmp OPENMP_CONFLICTS_INSTALL=3D libiomp5-devel-* =20 OPTIONS_SUB=3D yes @@ -173,16 +160,16 @@ BROKEN=3D GCC failing on 8.x =20 post-extract: .if ${PORT_OPTIONS:MCLANG} =2D ${MV} ${WRKDIR}/${CLANG_NAME} ${PATCH_WRKSRC}/tools/clang + ${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang .endif .if ${PORT_OPTIONS:MLLD} =2D ${MV} ${WRKDIR}/${LLD_NAME} ${PATCH_WRKSRC}/tools/lld + ${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld .endif .if ${PORT_OPTIONS:MLLDB} =2D ${MV} ${WRKDIR}/${LLDB_NAME} ${PATCH_WRKSRC}/tools/lldb + ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb .endif .if ${PORT_OPTIONS:MOPENMP} =2D ${MV} ${WRKDIR}/${OPENMP_NAME} ${PATCH_WRKSRC}/tools/openmp + ${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/tools/openmp .endif =20 post-patch: --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJVuHsdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bhE4IAMZd1r5tecvRBi5b9nIY48qq t6IzEPi4MFTwVTs9OH2NaaWH9/7oxT4Zes6gRGCtgQoDvpKXZEMonu9EZhrx7ViT JyeHLU34IARn/ounzba12ye4y6ICX98q5KrlBKmwOdGsBDIX3OjQUc+S4fmyO2I8 q4iBY46nHkyuCCIGHH6Oh5KS7E5eyEiubjlkjLgzskHkRXE5JquctOe9rvSWfGzh 4P4mzXeRqV+5illUuc2fBIDDCczY6DAJK/PtYkdFxR3j8Q5SrV314uaJr0/V91Vs QN351ka0XHJObhXs16XtuWuiufHcvzBA499Cu9+B74CoBSu/RWmHozcnCLPJykQ= =LguF -----END PGP SIGNATURE----- --=-=-=--