Sun Jun 13 19:02:30 2021 UTC ()
llvm: clean up pkglint


(wiz)
diff -r1.62 -r1.63 pkgsrc/lang/llvm/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/llvm/options.mk
cvs diff -r1.62 -r1.63 pkgsrc/lang/llvm/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/llvm/Makefile 2021/05/24 19:52:33 1.62
+++ pkgsrc/lang/llvm/Makefile 2021/06/13 19:02:30 1.63
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.62 2021/05/24 19:52:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.63 2021/06/13 19:02:30 wiz Exp $
2# 2#
3# when updating this, please also update: 3# when updating this, please also update:
4# devel/include-what-you-use 4# devel/include-what-you-use
5# devel/lld 5# devel/lld
6# devel/lldb 6# devel/lldb
7# devel/polly 7# devel/polly
8# lang/clang 8# lang/clang
9# lang/clang-tools-extra 9# lang/clang-tools-extra
10# lang/compiler-rt 10# lang/compiler-rt
11# lang/libcxx 11# lang/libcxx
12# lang/libcxxabi 12# lang/libcxxabi
13# lang/libunwind 13# lang/libunwind
14# parallel/openmp 14# parallel/openmp
@@ -25,27 +25,27 @@ @@ -25,27 +25,27 @@
25 25
26DISTNAME= llvm-${LLVM_VERSION}.src 26DISTNAME= llvm-${LLVM_VERSION}.src
27PKGNAME= ${DISTNAME:S/.src//} 27PKGNAME= ${DISTNAME:S/.src//}
28PKGREVISION= 4 28PKGREVISION= 4
29CATEGORIES= lang devel 29CATEGORIES= lang devel
30 30
31MAINTAINER= pkgsrc-users@NetBSD.org 31MAINTAINER= pkgsrc-users@NetBSD.org
32HOMEPAGE= https://llvm.org/ 32HOMEPAGE= https://llvm.org/
33COMMENT= Low Level Virtual Machine compiler infrastructure 33COMMENT= Low Level Virtual Machine compiler infrastructure
34LICENSE= apache-2.0 34LICENSE= apache-2.0
35 35
36USE_LANGUAGES= c c++14 36USE_LANGUAGES= c c++14
37USE_CMAKE= yes 37USE_CMAKE= yes
38GCC_REQD+= 5.1 38GCC_REQD+= 5
39PYTHON_FOR_BUILD_ONLY= yes 39PYTHON_FOR_BUILD_ONLY= yes
40 40
41NOT_FOR_PLATFORM+= *-*-alpha 41NOT_FOR_PLATFORM+= *-*-alpha
42NOT_FOR_PLATFORM+= *-*-vax 42NOT_FOR_PLATFORM+= *-*-vax
43 43
44CONFIGURE_DIRS= ${WRKDIR}/build 44CONFIGURE_DIRS= ${WRKDIR}/build
45CMAKE_ARG_PATH= ${WRKSRC} 45CMAKE_ARG_PATH= ${WRKSRC}
46 46
47CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 47CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
48CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q} 48CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
49CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q} 49CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
50CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q} 50CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
51CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON 51CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON
cvs diff -r1.7 -r1.8 pkgsrc/lang/llvm/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/llvm/options.mk 2020/07/06 07:16:00 1.7
+++ pkgsrc/lang/llvm/options.mk 2021/06/13 19:02:30 1.8
@@ -1,52 +1,52 @@ @@ -1,52 +1,52 @@
1# $NetBSD: options.mk,v 1.7 2020/07/06 07:16:00 he Exp $ 1# $NetBSD: options.mk,v 1.8 2021/06/13 19:02:30 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.llvm 3PKG_OPTIONS_VAR= PKG_OPTIONS.llvm
4 4
5LLVM_TARGETS= AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore 5LLVM_TARGETS= AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
6 6
7.for tgt in ${LLVM_TARGETS} 7.for tgt in ${LLVM_TARGETS}
8PLIST_VARS+= ${tgt} 8PLIST_VARS+= ${tgt}
9PKG_SUPPORTED_OPTIONS+= llvm-target-${tgt:tl} 9PKG_SUPPORTED_OPTIONS+= llvm-target-${tgt:tl}
10.endfor 10.endfor
11PKG_SUPPORTED_OPTIONS+= terminfo 11PKG_SUPPORTED_OPTIONS+= terminfo
12 12
13# Terminfo is used for colour output, only enable it by default if terminfo 13# Terminfo is used for colour output, only enable it by default if terminfo
14# is builtin to avoid unnecessary dependencies which could cause bootstrap 14# is builtin to avoid unnecessary dependencies which could cause bootstrap
15# issues. 15# issues.
16CHECK_BUILTIN.terminfo:= yes 16CHECK_BUILTIN.terminfo:= yes
17.include "../../mk/terminfo.builtin.mk" 17.include "../../mk/terminfo.builtin.mk"
18CHECK_BUILTIN.terminfo:= no 18CHECK_BUILTIN.terminfo:= no
19.if !empty(USE_BUILTIN.terminfo:M[yY][eE][sS]) 19.if !empty(USE_BUILTIN.terminfo:M[yY][eE][sS])
20PKG_SUGGESTED_OPTIONS+= terminfo 20PKG_SUGGESTED_OPTIONS+= terminfo
21.endif 21.endif
22 22
23# Probably safe to assume that only x86 users are interested in 23# Probably safe to assume that only x86 users are interested in
24# cross-compilation for now. This saves some build time for everyone else. 24# cross-compilation for now. This saves some build time for everyone else.
25.if !empty(MACHINE_ARCH:Msparc*) 25.if !empty(MACHINE_ARCH:Msparc*)
26PKG_SUGGESTED_OPTIONS+= llvm-target-sparc 26PKG_SUGGESTED_OPTIONS+= llvm-target-sparc
27.elif !empty(MACHINE_ARCH:Mpowerpc*) 27.elif !empty(MACHINE_ARCH:Mpowerpc*)
28PKG_SUGGESTED_OPTIONS+= llvm-target-powerpc 28PKG_SUGGESTED_OPTIONS+= llvm-target-powerpc
29# Needed to avoid "relocation truncated to fit: R_PPC_REL24" 29# Needed to avoid "relocation truncated to fit: R_PPC_REL24"
30CFLAGS+= -mlongcall 30CFLAGS+= -mlongcall
31CXXFLAGS+= -mlongcall 31CXXFLAGS+= -mlongcall
32.elif !empty(MACHINE_ARCH:Mearm*) 32.elif !empty(MACHINE_ARCH:Mearm*)
33PKG_SUGGESTED_OPTIONS+= llvm-target-arm 33PKG_SUGGESTED_OPTIONS+= llvm-target-arm
34.elif !empty(MACHINE_ARCH:M*mips*) 34.elif !empty(MACHINE_ARCH:M*mips*)
35PKG_SUGGESTED_OPTIONS+= llvm-target-mips 35PKG_SUGGESTED_OPTIONS+= llvm-target-mips
36.else 36.else
37# X86 and everyone else get all targets by default. 37# X86 and everyone else get all targets by default.
38. for tgt in ${LLVM_TARGETS} 38. for tgt in ${LLVM_TARGETS}
39PKG_SUGGESTED_OPTIONS+= llvm-target-${tgt:tl} 39PKG_SUGGESTED_OPTIONS+= llvm-target-${tgt:tl}
40. endfor 40. endfor
41.endif 41.endif
42 42
43.include "../../mk/bsd.options.mk" 43.include "../../mk/bsd.options.mk"
44 44
45.for tgt in ${LLVM_TARGETS} 45.for tgt in ${LLVM_TARGETS}
46. if !empty(PKG_OPTIONS:Mllvm-target-${tgt:tl}) 46. if !empty(PKG_OPTIONS:Mllvm-target-${tgt:tl})
47PLIST.${tgt}= yes 47PLIST.${tgt}= yes
48LLVM_TARGETS_TO_BUILD+= ${tgt} 48LLVM_TARGETS_TO_BUILD+= ${tgt}
49. endif 49. endif
50.endfor 50.endfor
51 51
52.if !empty(PKG_OPTIONS:Mterminfo) 52.if !empty(PKG_OPTIONS:Mterminfo)