From: Theo Buehler Subject: Re: clang.port.mk: fix detection of clang-scan-deps To: ports@openbsd.org, phessler@openbsd.org, rsadowski@openbsd.org Date: Mon, 6 Jul 2026 10:28:34 +0200 On Mon, Jul 06, 2026 at 10:21:12AM +0200, Jeremie Courreges-Anglas wrote: > > As reported by phessler: > > audio/openal: /bin/sh: /usr/local/bin/clang-scan-deps-22: not found > > and as analyzed by tb: > > [cmake] walks the path with clang-scan-deps-22.1, then clang-scan-deps-22, then clang-scan-deps. so if llvm/22 is installed, that takes priority. > > clang-scan-deps is detected in the same manner as ar and ranlib in > /usr/local/share/cmake/Modules/Compiler/Clang-FindBinUtils.cmake so > the diff below uses the same approach to force the use of the > executable from base. All our architectures with ports-clang also > ship base-clang and thus clang-scan-deps, so while slightly incorrect > I think this is good enough. Agreed, at least for now. It will probably break if we need to use llvm/!22 with scan-deps somewhere, but let's cross that bridge when we get there. ok tb > > With this, the openal build no longer fails if llvm%22 is installed at > configure time and then removed. ok? > > > Index: cmake.port.mk > =================================================================== > RCS file: /home/cvs/ports/devel/cmake/cmake.port.mk,v > diff -u -p -r1.91 cmake.port.mk > --- cmake.port.mk 13 May 2026 07:10:23 -0000 1.91 > +++ cmake.port.mk 6 Jul 2026 08:19:18 -0000 > @@ -165,6 +165,7 @@ _CMAKE_PROCESSING_LANGUAGE = ASM OBJCXX > .for LANG in ${_CMAKE_PROCESSING_LANGUAGE} > CONFIGURE_ARGS := -DCMAKE_${LANG}_COMPILER_AR:FILEPATH=/usr/bin/ar \ > -DCMAKE_${LANG}_COMPILER_RANLIB:FILEPATH=/usr/bin/ranlib \ > + -DCMAKE_${LANG}_COMPILER_CLANG_SCAN_DEPS:FILEPATH=/usr/bin/clang-scan-deps \ > ${CONFIGURE_ARGS} > .endfor > > -- > jca