Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 5EB481A921F for ; Thu, 31 Dec 2020 10:56:30 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 91B5784DD6; Thu, 31 Dec 2020 10:56:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CCDCC84DC7 for ; Thu, 31 Dec 2020 10:56:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id RfyFonWnnlmP for ; Thu, 31 Dec 2020 10:56:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2B70E84CE3 for ; Thu, 31 Dec 2020 10:56:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0487BFA9D; Thu, 31 Dec 2020 10:56:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_160941218737080" MIME-Version: 1.0 Date: Thu, 31 Dec 2020 10:56:27 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/devel/cpu_features To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20201231105628.0487BFA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_160941218737080 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Dec 31 10:56:27 UTC 2020 Modified Files: pkgsrc/devel/cpu_features: Makefile Log Message: cpu_features: Correct PLIST substitution for various architectures To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/cpu_features/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_160941218737080 Content-Disposition: inline Content-Length: 1160 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/cpu_features/Makefile diff -u pkgsrc/devel/cpu_features/Makefile:1.3 pkgsrc/devel/cpu_features/Makefile:1.4 --- pkgsrc/devel/cpu_features/Makefile:1.3 Mon Dec 14 17:23:49 2020 +++ pkgsrc/devel/cpu_features/Makefile Thu Dec 31 10:56:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/12/14 17:23:49 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2020/12/31 10:56:27 nia Exp $ GITHUB_TAG= v${PKGVERSION_NOREV} DISTNAME= cpu_features-0.6.0 @@ -15,6 +15,18 @@ USE_CMAKE= yes USE_LANGUAGES= c c++ CMAKE_ARGS+= -DBUILD_PIC=ON -PLIST_SUBST+= CPU_FEATURES_ARCH=${MACHINE_ARCH:S/i386/x86/:S/x86_64/x86/} +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +PLIST_SUBST+= CPU_FEATURES_ARCH=x86 +.elif !empty(MACHINE_ARCH:M*aarch64*) +PLIST_SUBST+= CPU_FEATURES_ARCH=aarch64 +.elif !empty(MACHINE_ARCH:M*powerpc*) +PLIST_SUBST+= CPU_FEATURES_ARCH=ppc +.elif !empty(MACHINE_ARCH:M*arm*) +PLIST_SUBST+= CPU_FEATURES_ARCH=arm +.elif !empty(MACHINE_ARCH:M*mips*) +PLIST_SUBST+= CPU_FEATURES_ARCH=mips +.else +PKG_FAIL_REASON+= "${MACHINE_ARCH} unsupported, see CMakeLists.txt" +.endif .include "../../mk/bsd.pkg.mk" --_----------=_160941218737080--