Date: Wed, 14 Dec 2022 12:32:08 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: dfe189dac467 - main - graphics/mesa-dri: respect LLVM_DEFAULT after e70ff172c205 Message-ID: <202212141232.2BECW8wR017836@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfe189dac4672b707b5a59538c63267773640c99 commit dfe189dac4672b707b5a59538c63267773640c99 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-12-14 11:23:38 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-12-14 12:04:26 +0000 graphics/mesa-dri: respect LLVM_DEFAULT after e70ff172c205 Meson probes FreeBSD suffixes[1] for llvm-config but ends up selecting the last match instead of the unsuffixed version. So, replace BINARY_ALIAS with recently introduced[2] ad hoc environ(7) variable. [1] https://github.com/mesonbuild/meson/blob/0.64.1/mesonbuild/environment.py#L159-L177 [2] https://github.com/mesonbuild/meson/commit/2c1ac8ac1ddb Approved by: manu (on dev-commits-ports-main@ list) --- graphics/mesa-dri/Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index f45f8d7250ff..b2ac1088bf5d 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -85,7 +85,7 @@ BINARY_ALIAS+= python3=${PYTHON_VERSION} LLVM_DEFAULT= 15 BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -BINARY_ALIAS+= llvm-config=llvm-config${LLVM_DEFAULT} +CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib MESON_ARGS+= -Dllvm=enabled
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212141232.2BECW8wR017836>