pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/libLLVM
Module Name: pkgsrc
Committed By: triaxx
Date: Mon Oct 31 14:54:38 UTC 2022
Modified Files:
pkgsrc/lang/libLLVM: Makefile options.mk
Log Message:
libLLVM: Improve fix for FreeBSD
pkgsrc changes:
---------------
* Replace conditional configuration in Makefile by conditional option support
in options.mk thanks to Tobias.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/libLLVM/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/libLLVM/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/libLLVM/Makefile
diff -u pkgsrc/lang/libLLVM/Makefile:1.41 pkgsrc/lang/libLLVM/Makefile:1.42
--- pkgsrc/lang/libLLVM/Makefile:1.41 Sun Oct 30 22:02:11 2022
+++ pkgsrc/lang/libLLVM/Makefile Mon Oct 31 14:54:38 2022
@@ -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 @@ CFLAGS+= -mlongcall
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: pkgsrc/lang/libLLVM/options.mk
diff -u pkgsrc/lang/libLLVM/options.mk:1.5 pkgsrc/lang/libLLVM/options.mk:1.6
--- pkgsrc/lang/libLLVM/options.mk:1.5 Sun Mar 13 15:22:32 2022
+++ pkgsrc/lang/libLLVM/options.mk Mon Oct 31 14:54:38 2022
@@ -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 @@ LLVM_TARGETS= AArch64 AMDGPU ARM AVR BPF
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 @@ PKG_SUPPORTED_OPTIONS+= terminfo
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
Home |
Main Index |
Thread Index |
Old Index