Sat Aug 13 09:11:12 2022 UTC ()
llvm: fix lint


(tnn)
diff -r1.75 -r1.76 pkgsrc/lang/llvm/Makefile
diff -r1.14 -r1.15 pkgsrc/lang/llvm/options.mk
cvs diff -r1.75 -r1.76 pkgsrc/lang/llvm/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/llvm/Makefile 2022/08/12 15:59:31 1.75
+++ pkgsrc/lang/llvm/Makefile 2022/08/13 09:11:12 1.76
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.75 2022/08/12 15:59:31 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.76 2022/08/13 09:11:12 tnn 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# lang/wasi-compiler-rt 14# lang/wasi-compiler-rt
@@ -29,32 +29,32 @@ DISTNAME= llvm-${LLVM_VERSION}.src @@ -29,32 +29,32 @@ DISTNAME= llvm-${LLVM_VERSION}.src
29PKGNAME= ${DISTNAME:S/.src//} 29PKGNAME= ${DISTNAME:S/.src//}
30CATEGORIES= lang devel 30CATEGORIES= lang devel
31 31
32MAINTAINER= pkgsrc-users@NetBSD.org 32MAINTAINER= pkgsrc-users@NetBSD.org
33HOMEPAGE= https://llvm.org/ 33HOMEPAGE= https://llvm.org/
34COMMENT= Low Level Virtual Machine compiler infrastructure 34COMMENT= Low Level Virtual Machine compiler infrastructure
35LICENSE= apache-2.0 35LICENSE= apache-2.0
36 36
37USE_LANGUAGES= c c++14 37USE_LANGUAGES= c c++14
38USE_CMAKE= yes 38USE_CMAKE= yes
39GCC_REQD+= 5 39GCC_REQD+= 5
40PYTHON_FOR_BUILD_ONLY= yes 40PYTHON_FOR_BUILD_ONLY= yes
41 41
42PYTHON_VERSIONS_INCOMPATIBLE= 27 42PYTHON_VERSIONS_INCOMPATIBLE= 27
43 43
44NOT_FOR_PLATFORM+= *-*-alpha 44NOT_FOR_PLATFORM+= *-*-alpha
45NOT_FOR_PLATFORM+= *-*-vax 45NOT_FOR_PLATFORM+= *-*-vax
46 46
47CONFIGURE_DIRS= ${WRKDIR}/build 47CONFIGURE_DIRS= build
48CMAKE_ARG_PATH= ${WRKSRC} 48CMAKE_ARG_PATH= ${WRKSRC}
49 49
50CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 50CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
51CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q} 51CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
52CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q} 52CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
53CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q} 53CMAKE_ARGS+= -DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
54CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON 54CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON
55CMAKE_ARGS+= -DLLVM_INCLUDE_BENCHMARKS=OFF 55CMAKE_ARGS+= -DLLVM_INCLUDE_BENCHMARKS=OFF
56CMAKE_ARGS+= -DLLVM_INSTALL_UTILS=ON 56CMAKE_ARGS+= -DLLVM_INSTALL_UTILS=ON
57CMAKE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON 57CMAKE_ARGS+= -DLLVM_LINK_LLVM_DYLIB=ON
58CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=ON 58CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=ON
59 59
60CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool 60CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
@@ -96,39 +96,39 @@ PLIST_VARS+= notdylib @@ -96,39 +96,39 @@ PLIST_VARS+= notdylib
96.if ${SHLIB_TYPE} == "dylib" 96.if ${SHLIB_TYPE} == "dylib"
97SOEXT= dylib 97SOEXT= dylib
98.else 98.else
99SOEXT= so 99SOEXT= so
100PLIST.notdylib= yes 100PLIST.notdylib= yes
101.endif 101.endif
102PLIST_SUBST+= SOEXT=${SOEXT} 102PLIST_SUBST+= SOEXT=${SOEXT}
103 103
104# needs std::atomic with 64-bit CAS 104# needs std::atomic with 64-bit CAS
105.if ${MACHINE_ARCH} == "i386" 105.if ${MACHINE_ARCH} == "i386"
106CXXFLAGS+= -march=i586 106CXXFLAGS+= -march=i586
107.endif 107.endif
108 108
109.if !empty(MACHINE_ARCH:Mpowerpc*) 109.if ${MACHINE_ARCH:Mpowerpc*}
110# Needed to avoid "relocation truncated to fit: R_PPC_REL24" 110# Needed to avoid "relocation truncated to fit: R_PPC_REL24"
111CFLAGS+= -mlongcall -mno-pltseq 111CFLAGS+= -mlongcall -mno-pltseq
112CXXFLAGS+= -mlongcall -mno-pltseq 112CXXFLAGS+= -mlongcall -mno-pltseq
113.endif 113.endif
114 114
115.if ${OPSYS} == "NetBSD" 115.if ${OPSYS} == "NetBSD"
116CMAKE_ARGS+= -DPKGSRC_LLVM_PTHREADLIB=-lpthread 116CMAKE_ARGS+= -DPKGSRC_LLVM_PTHREADLIB=-lpthread
117.endif 117.endif
118 118
119.include "options.mk" 119.include "options.mk"
120 120
121# replacing config.guess is required even for cmake. 121# replacing config.guess is required even for cmake.
122# It is used to detect correct LLVM_HOST_TRIPLE, e.g. for NetBSD/evbarm. 122# It is used to detect correct LLVM_HOST_TRIPLE, e.g. for NetBSD/evbarm.
123post-extract: 123post-extract:
124 ${MKDIR} ${WRKDIR}/build 124 ${MKDIR} ${WRKSRC}/build
125.for f in config.guess config.sub 125.for f in config.guess config.sub
126 cp ../../mk/gnu-config/${f} ${WRKSRC}/cmake/${f} 126 cp ../../mk/gnu-config/${f} ${WRKSRC}/cmake/${f}
127.endfor 127.endfor
128 128
129.include "../../devel/zlib/buildlink3.mk" 129.include "../../devel/zlib/buildlink3.mk"
130.include "../../lang/python/application.mk" 130.include "../../lang/python/application.mk"
131.include "../../lang/python/tool.mk" 131.include "../../lang/python/tool.mk"
132.include "../../textproc/libxml2/buildlink3.mk" 132.include "../../textproc/libxml2/buildlink3.mk"
133.include "../../mk/atomic64.mk" 133.include "../../mk/atomic64.mk"
134.include "../../mk/bsd.pkg.mk" 134.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/lang/llvm/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/llvm/options.mk 2022/08/12 08:37:58 1.14
+++ pkgsrc/lang/llvm/options.mk 2022/08/13 09:11:12 1.15
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1# $NetBSD: options.mk,v 1.14 2022/08/12 08:37:58 pin Exp $ 1# $NetBSD: options.mk,v 1.15 2022/08/13 09:11:12 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.llvm 3PKG_OPTIONS_VAR= PKG_OPTIONS.llvm
4 4
5LLVM_TARGETS= AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore 5LLVM_TARGETS= AArch64 AMDGPU ARM AVR 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 z3 11PKG_SUPPORTED_OPTIONS+= terminfo z3
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 ${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 ${MACHINE_ARCH:Msparc*}
26PKG_SUGGESTED_OPTIONS+= llvm-target-sparc 26PKG_SUGGESTED_OPTIONS+= llvm-target-sparc
27.elif !empty(MACHINE_ARCH:Mpowerpc*) 27.elif ${MACHINE_ARCH:Mpowerpc*}
28PKG_SUGGESTED_OPTIONS+= llvm-target-powerpc 28PKG_SUGGESTED_OPTIONS+= llvm-target-powerpc
29.elif ${MACHINE_ARCH} == aarch64 29.elif ${MACHINE_ARCH} == aarch64
30PKG_SUGGESTED_OPTIONS+= llvm-target-aarch64 30PKG_SUGGESTED_OPTIONS+= llvm-target-aarch64
31PKG_SUGGESTED_OPTIONS+= llvm-target-webassembly 31PKG_SUGGESTED_OPTIONS+= llvm-target-webassembly
32.elif !empty(MACHINE_ARCH:Mearm*) 32.elif ${MACHINE_ARCH:Mearm*}
33PKG_SUGGESTED_OPTIONS+= llvm-target-arm 33PKG_SUGGESTED_OPTIONS+= llvm-target-arm
34.elif !empty(MACHINE_ARCH:M*mips*) 34.elif ${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