From owner-svn-ports-head@freebsd.org Fri Oct 4 22:13:05 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DC5FE13ADB1; Fri, 4 Oct 2019 22:13:05 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46lPJd5WNzz3wdS; Fri, 4 Oct 2019 22:13:05 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 876D72E93; Fri, 4 Oct 2019 22:13:05 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x94MD5CI081613; Fri, 4 Oct 2019 22:13:05 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x94MD5qH081612; Fri, 4 Oct 2019 22:13:05 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201910042213.x94MD5qH081612@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Fri, 4 Oct 2019 22:13:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513787 - in head/devel: flang flang-clang X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in head/devel: flang flang-clang X-SVN-Commit-Revision: 513787 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 04 Oct 2019 22:13:05 -0000 Author: linimon Date: Fri Oct 4 22:13:04 2019 New Revision: 513787 URL: https://svnweb.freebsd.org/changeset/ports/513787 Log: Factor out hardcoding of the string "clang=0:devel/llvm60 -RUN_DEPENDS= llvm60>=0:devel/llvm60 +LLVM_VER= 60 +BUILD_DEPENDS= llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} +RUN_DEPENDS= llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} USES= cmake compiler:c++11-lib libedit tar:xz perl5 \ python shebangfix @@ -33,7 +34,7 @@ GH_ACCOUNT= flang-compiler GH_PROJECT= flang-driver GH_TAGNAME= 742de5f -CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config60 +CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} CMAKE_INSTALL_PREFIX= ${PREFIX}/flang Modified: head/devel/flang/Makefile ============================================================================== --- head/devel/flang/Makefile Fri Oct 4 22:12:43 2019 (r513786) +++ head/devel/flang/Makefile Fri Oct 4 22:13:04 2019 (r513787) @@ -14,9 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 -BUILD_DEPENDS= llvm60>=0:devel/llvm60 \ +LLVM_VER= 60 +BUILD_DEPENDS= llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} \ flang-clang>=0:devel/flang-clang -RUN_DEPENDS= llvm60>=0:devel/llvm60 \ +RUN_DEPENDS= llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} \ flang-clang>=0:devel/flang-clang LIB_DEPENDS= libpgmath.so:math/libpgmath @@ -30,11 +31,11 @@ USE_GITHUB= yes GH_ACCOUNT= flang-compiler GH_TAGNAME= 53e368b -CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config60 \ +CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} \ -DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \ -DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \ -DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang \ - -DFLANG_LIBOMP=${LOCALBASE}/llvm60/lib/libomp.so \ + -DFLANG_LIBOMP=${LOCALBASE}/llvm${LLVM_VER}/lib/libomp.so \ -DLIBPGMATH="${LOCALBASE}/lib/libpgmath.a" \ -WWITH_ERROR=OFF