Re: CVS commit: pkgsrc/lang/libLLVM

[Frédéric Fauberteau <triaxx%NetBSD.org@localhost>]

Hi,

> Le 30 oct. 2022 à 23:32, Tobias Nygren <tnn%NetBSD.org@localhost> a écrit :
> 
> Hi,
> 
> On Sun, 30 Oct 2022 22:02:11 +0000
> Frédéric Fauberteau <triaxx%netbsd.org@localhost> wrote:
> 
>> Modified Files:
>>      pkgsrc/lang/libLLVM: Makefile
>> 
>> Log Message:
>> libLLVM: Fix building on FreeBSD
> 
>> +CMAKE_ARGS+=        -DLLVM_ENABLE_TERMINFO=OFF
> 
> There is a PKG_OPTION in the llvm packages that controls this.
> Please change this so that the option is not added to
> PKG_SUGGESTED_OPTIONS on FreeBSD (and sync the change to lang/llvm if
> needed).
> 
> -Tobias

It actually makes more sense to do it that way. Do you think it is correct like that?

cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/libLLVM/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile    30 Oct 2022 22:02:11 -0000      1.41
+++ Makefile    31 Oct 2022 13:42:17 -0000
@@ -122,11 +122,6 @@
 CXXFLAGS+=     -mlongcall
 .endif
 
-# LLVM likes to pick up ${LOCALBASE}/lib/libtinfo.so.*
-.if ${OPSYS} == "FreeBSD"
-CMAKE_ARGS+=   -DLLVM_ENABLE_TERMINFO=OFF
-.endif
-
 .include "options.mk"
 
 # replacing config.guess is required even for cmake.
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/libLLVM/options.mk,v
retrieving revision 1.5
diff -u -r1.5 options.mk
--- options.mk  13 Mar 2022 15:22:32 -0000      1.5
+++ options.mk  31 Oct 2022 13:42:17 -0000
@@ -8,7 +8,9 @@
 PLIST_VARS+=                   ${tgt}
 PKG_SUPPORTED_OPTIONS+=                llvm-target-${tgt:tl}
 .endfor
+.if ${OPSYS} != "FreeBSD"
 PKG_SUPPORTED_OPTIONS+=                terminfo
+.endif
 
 # Terminfo is used for colour output, only enable it by default if terminfo
 # is builtin to avoid unnecessary dependencies which could cause bootstrap
@@ -16,7 +18,7 @@
 CHECK_BUILTIN.terminfo:=       yes
 .include "../../mk/terminfo.builtin.mk"
 CHECK_BUILTIN.terminfo:=       no
-.if !empty(USE_BUILTIN.terminfo:M[yY][eE][sS])
+.if !empty(USE_BUILTIN.terminfo:M[yY][eE][sS]) && ${OPSYS} != "FreeBSD"
 PKG_SUGGESTED_OPTIONS+=                terminfo
 .endif

Thank you Tobias!

Fred