CVS commit: pkgsrc/lang/llvm

["Frederic Cambus" <fcambus%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fcambus
Date:           Sat Jun 11 13:44:05 UTC 2022

Modified Files:
        pkgsrc/lang/llvm: buildlink3.mk options.mk

Log Message:
llvm: add a z3 option to allow building against the Z3 constraint solver.

When both lang/llvm and lang/clang are built with the z3 option enabled,
the Z3 constraint solver is activated for the Clang static analyzer.

This option is not enabled by default.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/llvm/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/llvm/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/llvm/buildlink3.mk
diff -u pkgsrc/lang/llvm/buildlink3.mk:1.16 pkgsrc/lang/llvm/buildlink3.mk:1.17
--- pkgsrc/lang/llvm/buildlink3.mk:1.16 Tue Nov 23 20:55:44 2021
+++ pkgsrc/lang/llvm/buildlink3.mk      Sat Jun 11 13:44:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2021/11/23 20:55:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2022/06/11 13:44:05 fcambus Exp $
 
 BUILDLINK_TREE+=       llvm
 
@@ -98,6 +98,10 @@ pkgbase := llvm
 .include "../../mk/terminfo.buildlink3.mk"
 .endif
 
+.if ${PKG_BUILD_OPTIONS.llvm:Mz3}
+.include "../../math/z3/buildlink3.mk"
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
 .endif # LLVM_BUILDLINK3_MK
 

Index: pkgsrc/lang/llvm/options.mk
diff -u pkgsrc/lang/llvm/options.mk:1.12 pkgsrc/lang/llvm/options.mk:1.13
--- pkgsrc/lang/llvm/options.mk:1.12    Fri Jan  7 15:44:32 2022
+++ pkgsrc/lang/llvm/options.mk Sat Jun 11 13:44:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2022/01/07 15:44:32 tnn Exp $
+# $NetBSD: options.mk,v 1.13 2022/06/11 13:44:05 fcambus Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.llvm
 
@@ -8,7 +8,7 @@ LLVM_TARGETS=   AArch64 AMDGPU ARM AVR BPF
 PLIST_VARS+=                   ${tgt}
 PKG_SUPPORTED_OPTIONS+=                llvm-target-${tgt:tl}
 .endfor
-PKG_SUPPORTED_OPTIONS+=                terminfo
+PKG_SUPPORTED_OPTIONS+=                terminfo z3
 
 # Terminfo is used for colour output, only enable it by default if terminfo
 # is builtin to avoid unnecessary dependencies which could cause bootstrap
@@ -55,4 +55,9 @@ LLVM_TARGETS_TO_BUILD+=       ${tgt}
 CMAKE_ARGS+=   -DLLVM_ENABLE_TERMINFO=OFF
 .endif
 
+.if !empty(PKG_OPTIONS:Mz3)
+.include "../../math/z3/buildlink3.mk"
+CMAKE_ARGS+=   -DLLVM_ENABLE_Z3_SOLVER=ON
+.endif
+
 CMAKE_ARGS+=   -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:ts;}"