Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1660381872273870"
MIME-Version: 1.0
Date: Sat, 13 Aug 2022 09:11:12 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/lang/llvm
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20220813091112.EE2BEFB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1660381872273870
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Sat Aug 13 09:11:12 UTC 2022

Modified Files:
	pkgsrc/lang/llvm: Makefile options.mk

Log Message:
llvm: fix lint


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/llvm/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1660381872273870
Content-Disposition: inline
Content-Length: 2889
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.75 pkgsrc/lang/llvm/Makefile:1.76
--- pkgsrc/lang/llvm/Makefile:1.75	Fri Aug 12 15:59:31 2022
+++ pkgsrc/lang/llvm/Makefile	Sat Aug 13 09:11:12 2022
@@ -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 @@ USE_CMAKE=		yes
 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 @@ PLIST_SUBST+=	SOEXT=${SOEXT}
 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 @@ CMAKE_ARGS+=	-DPKGSRC_LLVM_PTHREADLIB=-l
 # 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

Index: pkgsrc/lang/llvm/options.mk
diff -u pkgsrc/lang/llvm/options.mk:1.14 pkgsrc/lang/llvm/options.mk:1.15
--- pkgsrc/lang/llvm/options.mk:1.14	Fri Aug 12 08:37:58 2022
+++ pkgsrc/lang/llvm/options.mk	Sat Aug 13 09:11:12 2022
@@ -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 @@ PKG_SUPPORTED_OPTIONS+=		terminfo z3
 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.


--_----------=_1660381872273870--