pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/llvm llvm: fix lint



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7abc4ba227e
branches:  trunk
changeset: 383146:c7abc4ba227e
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Aug 13 09:11:12 2022 +0000

description:
llvm: fix lint

diffstat:

 lang/llvm/Makefile   |  10 +++++-----
 lang/llvm/options.mk |  12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (79 lines):

diff -r 9d5308b7ff9b -r c7abc4ba227e lang/llvm/Makefile
--- a/lang/llvm/Makefile        Sat Aug 13 09:09:54 2022 +0000
+++ b/lang/llvm/Makefile        Sat Aug 13 09:11:12 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2022/08/12 15:59:31 gutteridge Exp $
+# $NetBSD: Makefile,v 1.76 2022/08/13 09:11:12 tnn Exp $
 #
 # When updating this, please also update:
 # devel/include-what-you-use
@@ -39,12 +39,12 @@
 GCC_REQD+=             5
 PYTHON_FOR_BUILD_ONLY= yes
 
-PYTHON_VERSIONS_INCOMPATIBLE=   27
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 NOT_FOR_PLATFORM+=     *-*-alpha
 NOT_FOR_PLATFORM+=     *-*-vax
 
-CONFIGURE_DIRS=                ${WRKDIR}/build
+CONFIGURE_DIRS=                build
 CMAKE_ARG_PATH=                ${WRKSRC}
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
@@ -106,7 +106,7 @@
 CXXFLAGS+=     -march=i586
 .endif
 
-.if !empty(MACHINE_ARCH:Mpowerpc*)
+.if ${MACHINE_ARCH:Mpowerpc*}
 # Needed to avoid "relocation truncated to fit: R_PPC_REL24"
 CFLAGS+=       -mlongcall -mno-pltseq
 CXXFLAGS+=     -mlongcall -mno-pltseq
@@ -121,7 +121,7 @@
 # replacing config.guess is required even for cmake.
 # It is used to detect correct LLVM_HOST_TRIPLE, e.g. for NetBSD/evbarm.
 post-extract:
-       ${MKDIR} ${WRKDIR}/build
+       ${MKDIR} ${WRKSRC}/build
 .for f in config.guess config.sub
        cp ../../mk/gnu-config/${f} ${WRKSRC}/cmake/${f}
 .endfor
diff -r 9d5308b7ff9b -r c7abc4ba227e lang/llvm/options.mk
--- a/lang/llvm/options.mk      Sat Aug 13 09:09:54 2022 +0000
+++ b/lang/llvm/options.mk      Sat Aug 13 09:11:12 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2022/08/12 08:37:58 pin Exp $
+# $NetBSD: options.mk,v 1.15 2022/08/13 09:11:12 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.llvm
 
@@ -16,22 +16,22 @@
 CHECK_BUILTIN.terminfo:=       yes
 .include "../../mk/terminfo.builtin.mk"
 CHECK_BUILTIN.terminfo:=       no
-.if !empty(USE_BUILTIN.terminfo:M[yY][eE][sS])
+.if ${USE_BUILTIN.terminfo:M[yY][eE][sS]}
 PKG_SUGGESTED_OPTIONS+=                terminfo
 .endif
 
 # Probably safe to assume that only x86 users are interested in
 # cross-compilation for now. This saves some build time for everyone else.
-.if !empty(MACHINE_ARCH:Msparc*)
+.if ${MACHINE_ARCH:Msparc*}
 PKG_SUGGESTED_OPTIONS+=        llvm-target-sparc
-.elif !empty(MACHINE_ARCH:Mpowerpc*)
+.elif ${MACHINE_ARCH:Mpowerpc*}
 PKG_SUGGESTED_OPTIONS+=        llvm-target-powerpc
 .elif ${MACHINE_ARCH} == aarch64
 PKG_SUGGESTED_OPTIONS+=        llvm-target-aarch64
 PKG_SUGGESTED_OPTIONS+=        llvm-target-webassembly
-.elif !empty(MACHINE_ARCH:Mearm*)
+.elif ${MACHINE_ARCH:Mearm*}
 PKG_SUGGESTED_OPTIONS+=        llvm-target-arm
-.elif !empty(MACHINE_ARCH:M*mips*)
+.elif ${MACHINE_ARCH:M*mips*}
 PKG_SUGGESTED_OPTIONS+=        llvm-target-mips
 .else
 # X86 and everyone else get all targets by default.



Home | Main Index | Thread Index | Old Index