[pkgsrc/trunk]: pkgsrc/lang/libLLVM libLLVM: Improve fix for FreeBSD

[triaxx <triaxx%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/80790ee7405f
branches:  trunk
changeset: 387522:80790ee7405f
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Mon Oct 31 14:54:38 2022 +0000

description:
libLLVM: Improve fix for FreeBSD

pkgsrc changes:
---------------
  * Replace conditional configuration in Makefile by conditional option support
    in options.mk thanks to Tobias.

diffstat:

 lang/libLLVM/Makefile   |  7 +------
 lang/libLLVM/options.mk |  6 ++++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r dbdf9041ad5d -r 80790ee7405f lang/libLLVM/Makefile
--- a/lang/libLLVM/Makefile     Mon Oct 31 14:01:49 2022 +0000
+++ b/lang/libLLVM/Makefile     Mon Oct 31 14:54:38 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2022/10/30 22:02:11 triaxx Exp $
+# $NetBSD: Makefile,v 1.42 2022/10/31 14:54:38 triaxx Exp $
 
 DISTNAME=      llvm-13.0.1.src
 PKGNAME=       ${DISTNAME:S/llvm/libLLVM/:S/.src//}
@@ -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.
diff -r dbdf9041ad5d -r 80790ee7405f lang/libLLVM/options.mk
--- a/lang/libLLVM/options.mk   Mon Oct 31 14:01:49 2022 +0000
+++ b/lang/libLLVM/options.mk   Mon Oct 31 14:54:38 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2022/03/13 15:22:32 tnn Exp $
+# $NetBSD: options.mk,v 1.6 2022/10/31 14:54:38 triaxx Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libLLVM
 
@@ -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