On Feb 17, 2025, at 10:43, Brooks Davis <bro...@freebsd.org> wrote:
> On Sun, Feb 16, 2025 at 06:34:46AM -0800, Mark Millard wrote:
>> On Feb 16, 2025, at 06:24, Mark Millard <mark...@yahoo.com> wrote:
>>
>>> On Feb 16, 2025, at 05:49, Mark Millard <mark...@yahoo.com> wrote:
>>>
>>>> I expect that should have been: libLLVM-20.so
>>>>
>>>> So, analogous to:
>>>>
>>>> # find -s / -name "libLLVM*.so*" -print | more
>>>> /usr/local/llvm19/lib/libLLVM-19.so
>>>> /usr/local/llvm19/lib/libLLVM.so
>>>> /usr/local/llvm19/lib/libLLVM.so.19.1
>>>>
>>>> At the moment I do not expect this to be an oddity of
>>>> my personal environment unless it is just for -rc1 .
>>>
>>> Looks to me like one example of code that may get
>>> things wrong for llvm20 is in /usr/ports/Mk/Uses/llvm.mk :
>>>
>>> . . .
>>> . if empty(_LLVM_MK_VERSION)
>>> . if ${LLVM_DEFAULT:N1[0-9]*}
>>> _LLVM_MK_VERSION= ${LLVM_DEFAULT:S/0$//}
>>> . else
>>> _LLVM_MK_VERSION= ${LLVM_DEFAULT}
>>> . endif
>>> . endif
>>> . . .
>>
>> Another area in /usr/ports/Mk/Uses/llvm.mk that may
>> have related problems is tied to:
>>
>> # === define helpers for the dependencies ===
>> . for _ver in ${_LLVM_MK_VALID_VERSIONS:N1[0-9]}
>> _LLVM_MK_SUFFIX_${_ver}= ${_ver}0
>> . endfor
>
> I've removed these bits. It was a leftover from supporting llvm[789]0.
> I think it was also broken for llvm10.
Thanks.
Note:
The :N1[0-9] pattern meant that llvm 10 used:
_LLVM_MK_VERSION= ${LLVM_DEFAULT}
and did not use either of:
_LLVM_MK_VERSION= ${LLVM_DEFAULT:S/0$//}
_LLVM_MK_SUFFIX_${_ver}= ${_ver}0
as I understand. Thus llvm20 is the first >= 10
one to use those 2 lines and the first to have
the problem.
===
Mark Millard
marklmi at yahoo.com
