Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C319684D0E for ; Mon, 3 Jul 2023 20:57:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Qxz_idCWzjkn for ; Mon, 3 Jul 2023 20:57:53 +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 4286384D0C for ; Mon, 3 Jul 2023 20:57:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E9B9FFA89; Mon, 3 Jul 2023 20:57:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1688417872215700" MIME-Version: 1.0 Date: Mon, 3 Jul 2023 20:57:52 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2023Q2] pkgsrc/textproc/py-rapidfuzz To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20230703205752.E9B9FFA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1688417872215700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Mon Jul 3 20:57:52 UTC 2023 Modified Files: pkgsrc/textproc/py-rapidfuzz [pkgsrc-2023Q2]: Makefile Log Message: Pullup ticket #6773 - requested by gdt textproc/py-rapidfuzz: i386 build fix Revisions pulled up: - textproc/py-rapidfuzz/Makefile 1.12 --- Module Name: pkgsrc Committed By: gdt Date: Mon Jul 3 13:54:32 UTC 2023 Modified Files: pkgsrc/textproc/py-rapidfuzz: Makefile Log Message: textprox/py-rapidfuzz: Exclude i386 from avx2 PLIST conditional This package had untested code to expect three files that are avx2-only when building on i386, but those files don't actually get built. This is almost certainly because not all i486-and-up CPUs have avx2 instructions. Resolves failure to package on NetBSD 9 i386 using cpu0: "Intel(R) Core(TM)2 Duo CPU T8100 @ 2.10GHz" To generate a diff of this commit: cvs rdiff -u -r1.10.2.2 -r1.10.2.3 pkgsrc/textproc/py-rapidfuzz/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1688417872215700 Content-Disposition: inline Content-Length: 860 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/py-rapidfuzz/Makefile diff -u pkgsrc/textproc/py-rapidfuzz/Makefile:1.10.2.2 pkgsrc/textproc/py-rapidfuzz/Makefile:1.10.2.3 --- pkgsrc/textproc/py-rapidfuzz/Makefile:1.10.2.2 Mon Jul 3 13:53:33 2023 +++ pkgsrc/textproc/py-rapidfuzz/Makefile Mon Jul 3 20:57:52 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10.2.2 2023/07/03 13:53:33 gdt Exp $ +# $NetBSD: Makefile,v 1.10.2.3 2023/07/03 20:57:52 bsiegert Exp $ DISTNAME= rapidfuzz-3.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,7 +21,9 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 PLIST_SUBST+= PYTHON_VERSION=${_PYTHON_VERSION} PLIST_VARS+= avx2 -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +# Only x86_64 is guaranteed to have avx2; while some i386 CPUs do, our +# build target does not. +.if ${MACHINE_ARCH} == "x86_64" PLIST.avx2= yes .endif --_----------=_1688417872215700--