From owner-svn-ports-head@freebsd.org Mon Mar 15 06:04:48 2021 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 5A261571514; Mon, 15 Mar 2021 06:04:48 +0000 (UTC) (envelope-from danfe@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DzQqh25LGz3skL; Mon, 15 Mar 2021 06:04:48 +0000 (UTC) (envelope-from danfe@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 3A9C937AD; Mon, 15 Mar 2021 06:04:48 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12F64mqr005309; Mon, 15 Mar 2021 06:04:48 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12F64lNK005308; Mon, 15 Mar 2021 06:04:48 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202103150604.12F64lNK005308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 15 Mar 2021 06:04:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568432 - head/graphics/mesa-dri X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/graphics/mesa-dri X-SVN-Commit-Revision: 568432 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.34 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: Mon, 15 Mar 2021 06:04:48 -0000 Author: danfe Date: Mon Mar 15 06:04:47 2021 New Revision: 568432 URL: https://svnweb.freebsd.org/changeset/ports/568432 Log: Improve r556423 and allow building against custom LLVM version, i.e. respect flexible LLVM_DEFAULT, by not hardcoding package version and depending on the appropriate executable instead. This is to help users sticking to the particular LLVM versions lower the number of different LLVM packages installed. For example, there is currently a mismatch between LLVM_DEFAULT assigned by the default versions framework (90) and in this file (10; this hasn't changed). Modified: head/graphics/mesa-dri/Makefile.common Modified: head/graphics/mesa-dri/Makefile.common ============================================================================== --- head/graphics/mesa-dri/Makefile.common Mon Mar 15 05:52:41 2021 (r568431) +++ head/graphics/mesa-dri/Makefile.common Mon Mar 15 06:04:47 2021 (r568432) @@ -93,9 +93,9 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src_gallium_auxiliar BINARY_ALIAS+= python3=${PYTHON_VERSION} LLVM_DEFAULT= 10 -BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>=10.0.1_1:devel/llvm${LLVM_DEFAULT} +BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .if ${COMPONENT} != libs -RUN_DEPENDS+= llvm${LLVM_DEFAULT}>=10.0.1_1:devel/llvm${LLVM_DEFAULT} +RUN_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .endif MESON_ARGS+= --native-file="${WRKSRC}/llvm.ini"