From owner-svn-ports-head@freebsd.org Wed Sep 20 05:54:27 2017 Return-Path: Delivered-To: svn-ports-head@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 06586E24657; Wed, 20 Sep 2017 05:54:27 +0000 (UTC) (envelope-from melounmichal@gmail.com) Received: from mail-wr0-x22a.google.com (mail-wr0-x22a.google.com [IPv6:2a00:1450:400c:c0c::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 98C0B81066; Wed, 20 Sep 2017 05:54:26 +0000 (UTC) (envelope-from melounmichal@gmail.com) Received: by mail-wr0-x22a.google.com with SMTP id l39so1174620wrl.12; Tue, 19 Sep 2017 22:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:reply-to:subject:to:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=UzckHO+pK9+MtCceUNTiEk5rUJgFOOIdrBu3PtihhZM=; b=l094Mf+QDERpqy4sTTJ97jRL3as1EK6jsDaCkTCoNunSCw0jUiz78ljvfU144w9kZ0 E95xguZUriJa8kXIVHvnh8liuhF7FANt4yOkkeOt0SDTCGGaCFVHnyUbP/lfsTD5UQoh DgxWKizz1HZ/tc4LqWJEygCOIP1hSo4HCYVC7cz3gDw9iJy0iaC+5Ixr1GFtwy+p0ki8 SYDTIK6fMpv7FKIvetuEUp/dvDN5h2sl94DqVRt3CZrQINSBnQfZeEjPWDKaKnJasU2d GlICHLlodoPNbn9qZXRNvS2v5avg+WcyNflGzAMTKoAYlcv9eiAvpDiXf31rMYV6BY8q zwiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:reply-to:subject:to:references:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=UzckHO+pK9+MtCceUNTiEk5rUJgFOOIdrBu3PtihhZM=; b=aJAT60IWYf66shiqlclDod7/WuchPntfKXWMaOcWU7toc0zFlZ/EUGc+6INPwyfng/ 7XDlA0CgE68dCpwbQ9fM7C6Ul0EFFAe/Of+cEV9wmnUVgaoABmj9ep2EKX2NlbqZ1dsH qCISBDO36eylVByQcvMl7uFq2L7t2wmKX7HWV1tf1zjovBwjWMTobzFQrgPSoUY/oj7Y yTIifhvx74KXbZqY19O+zgqfYvCffgYES7NcRFNU6h2L9/kYpvBg4RzL8B+LOAkT+CAF VQ+AJ8tad8KYl+6gpX4A8fh0hklp6zLEjN3YkilnQDaGrgeTOqo6eIexFDHhu55Yctg7 WwVA== X-Gm-Message-State: AHPjjUimoHM9wUiYTyg2ySHUR837J382QNN49xIfcCHP2oAOlWmBPxyc OSAqn34qFi4Hy1QtVnJ3E3tbfNxKSWI= X-Google-Smtp-Source: AOwi7QB/Nr9nWnq3MoJaG9lzzaY9ybL+AjcuM2gYiWhGwHihIo8URk/06hqWZBt6ILlSrEMdzM9lAg== X-Received: by 10.223.153.106 with SMTP id x97mr3290363wrb.107.1505886864438; Tue, 19 Sep 2017 22:54:24 -0700 (PDT) Received: from [88.208.79.100] (halouny.humusoft.cz. [88.208.79.100]) by smtp.gmail.com with ESMTPSA id r15sm945462wrc.30.2017.09.19.22.54.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 22:54:23 -0700 (PDT) From: Michal Meloun X-Google-Original-From: Michal Meloun Reply-To: mmel@freebsd.org Subject: Re: svn commit: r450176 - in head/devel/llvm50: . files To: Brooks Davis , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <201709192344.v8JNiZ4q019250@repo.freebsd.org> Message-ID: <016d0555-8a55-29bf-d271-8118bf9d6acd@freebsd.org> Date: Wed, 20 Sep 2017 07:54:23 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <201709192344.v8JNiZ4q019250@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2017 05:54:27 -0000 On 20.09.2017 1:44, Brooks Davis wrote: > Author: brooks > Date: Tue Sep 19 23:44:35 2017 > New Revision: 450176 > URL: https://svnweb.freebsd.org/changeset/ports/450176 > > Log: > Disable LLDB builds on 10.x as they don't link. > > Attempt to correct default targets. [0] > > Fix more references to clang-format50 and use a more future proof > patching approach. [1] > > Build and install pp-trace with the EXTRAS target. > > PR: 219779 [0], 220995 [1], 222380 [2] > > Added: > head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py (contents, props changed) > head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_git-clang-format (contents, props changed) > Modified: > head/devel/llvm50/Makefile > head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py > head/devel/llvm50/pkg-plist > First, thanks for your effort. Unfortunately, this doesn't fully solve issue from PR 219779. The default triplet for armv6 'armv6-portbld-freebsd12.0' is still invalid, it missing right ABI selector. Proper triplet (quad) should be armv6-portbld-freebsd-gnueabihf for FreeBSD >= 11 and armv6-portbld-freebsd-gnueabi for earlier versions. Thanks, Michal > Modified: head/devel/llvm50/Makefile > ============================================================================== > --- head/devel/llvm50/Makefile Tue Sep 19 23:36:53 2017 (r450175) > +++ head/devel/llvm50/Makefile Tue Sep 19 23:44:35 2017 (r450176) > @@ -2,6 +2,7 @@ > > PORTNAME= llvm > DISTVERSION= 5.0.0 > +PORTREVISON= 1 > CATEGORIES= devel lang > MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR} > PKGNAMESUFFIX= ${LLVM_SUFFIX} > @@ -39,6 +40,8 @@ SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${ > > CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} > CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON > +CMAKE_ARGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET} > +CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} > # Following commit https://github.com/kitware/cmake/commit/956054 > # we need to either change the whole man-shuffle below, or simply > # redefine CMAKE_INSTALL_MANDIR > @@ -50,6 +53,7 @@ OPTIONS_DEFINE_i386= COMPILER_RT > OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB > OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP > OPTIONS_DEFAULT_i386= COMPILER_RT > +OPTIONS_EXCLUDE_FreeBSD_10= LLDB > OPTIONS_SUB= yes > > CLANG_DESC= Build clang > @@ -58,6 +62,8 @@ CLANG_EXTRA_PATCHES= \ > ${PATCHDIR}/clang-patch-fopenmp.diff \ > ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt \ > ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \ > + ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py \ > + ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_git-clang-format \ > ${PATCHDIR}/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer > CLANG_CONFLICTS_INSTALL= clang-devel-3.[1234567]* > CLANG_DISTFILES= cfe-${DISTVERSION}.src${EXTRACT_SUFX} > @@ -168,7 +174,8 @@ EXTRAS_COMMANDS+= \ > clang-reorder-fields \ > clang-tidy \ > find-all-symbols \ > - modularize > + modularize \ > + pp-trace > EXTRAS_LIBS= libclangApplyReplacements \ > libclangChangeNamespace \ > libclangIncludeFixer \ > @@ -356,6 +363,10 @@ post-patch: > post-patch-CLANG-on: > ${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \ > ${PATCH_WRKSRC}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp > + ${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \ > + ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \ > + ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \ > + ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format > > post-build-COMPILER_RT-on: > ${MKDIR} ${WRKDIR}/compiler-rt-build > > Added: head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py Tue Sep 19 23:44:35 2017 (r450176) > @@ -0,0 +1,14 @@ > + > +$FreeBSD$ > + > +--- tools/clang/tools/clang-format/clang-format-sublime.py.orig > ++++ tools/clang/tools/clang-format/clang-format-sublime.py > +@@ -18,7 +18,7 @@ > + import subprocess > + > + # Change this to the full path if clang-format is not on the path. > +-binary = 'clang-format' > ++binary = 'clang-format%%LLVM_SUFFIX%%' > + > + # Change this to format according to other formatting styles. See the output of > + # 'clang-format --help' for a list of supported styles. The default looks for > > Modified: head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py > ============================================================================== > --- head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py Tue Sep 19 23:36:53 2017 (r450175) > +++ head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py Tue Sep 19 23:44:35 2017 (r450176) > @@ -5,7 +5,7 @@ > # set g:clang_format_path to the path to clang-format if it is not on the path > # Change this to the full path if clang-format is not on the path. > -binary = 'clang-format' > -+binary = 'clang-format39' > ++binary = 'clang-format%%LLVM_SUFFIX%%' > if vim.eval('exists("g:clang_format_path")') == "1": > binary = vim.eval('g:clang_format_path') > > > Added: head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_git-clang-format > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_git-clang-format Tue Sep 19 23:44:35 2017 (r450176) > @@ -0,0 +1,32 @@ > + > +$FreeBSD$ > + > +--- tools/clang/tools/clang-format/git-clang-format.orig > ++++ tools/clang/tools/clang-format/git-clang-format > +@@ -90,7 +90,7 @@ > + usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter, > + description=desc) > + p.add_argument('--binary', > +- default=config.get('clangformat.binary', 'clang-format'), > ++ default=config.get('clangformat.binary', 'clang-format%%LLVM_SUFFIX%%'), > + help='path to clang-format'), > + p.add_argument('--commit', > + default=config.get('clangformat.commit', 'HEAD'), > +@@ -344,7 +344,7 @@ > + > + > + def run_clang_format_and_save_to_tree(changed_lines, revision=None, > +- binary='clang-format', style=None): > ++ binary='clang-format%%LLVM_SUFFIX%%', style=None): > + """Run clang-format on each file and save the result to a git tree. > + > + Returns the object ID (SHA-1) of the created tree.""" > +@@ -397,7 +397,7 @@ > + > + > + def clang_format_to_blob(filename, line_ranges, revision=None, > +- binary='clang-format', style=None): > ++ binary='clang-format%%LLVM_SUFFIX%%', style=None): > + """Run clang-format on the given file and save the result to a git blob. > + > + Runs on the file in `revision` if not None, or on the file in the working > > Modified: head/devel/llvm50/pkg-plist > ============================================================================== > --- head/devel/llvm50/pkg-plist Tue Sep 19 23:36:53 2017 (r450175) > +++ head/devel/llvm50/pkg-plist Tue Sep 19 23:44:35 2017 (r450176) > @@ -64,6 +64,7 @@ bin/sancov%%LLVM_SUFFIX%% > %%EXTRAS%%bin/clang-tidy%%LLVM_SUFFIX%% > %%EXTRAS%%bin/find-all-symbols%%LLVM_SUFFIX%% > %%EXTRAS%%bin/modularize%%LLVM_SUFFIX%% > +%%EXTRAS%%bin/pp-trace%%LLVM_SUFFIX%% > %%LLD%%bin/lld%%LLVM_SUFFIX%% > %%LLD%%bin/lld-link%%LLVM_SUFFIX%% > %%LIT%%bin/lit%%LLVM_SUFFIX%% > _______________________________________________ > svn-ports-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-head > To unsubscribe, send any mail to "svn-ports-head-unsubscribe@freebsd.org" >