From nobody Mon Jan 03 09:01:00 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 42D69191D096; Mon, 3 Jan 2022 09:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JS8qJ6jX9z4gQN; Mon, 3 Jan 2022 09:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C75A822746; Mon, 3 Jan 2022 09:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 203910ZA077046; Mon, 3 Jan 2022 09:01:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203910sV077045; Mon, 3 Jan 2022 09:01:00 GMT (envelope-from git) Date: Mon, 3 Jan 2022 09:01:00 GMT Message-Id: <202201030901.203910sV077045@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: a2cfb3e0589d - main - math/py-numpy: revert obsolete commit 507c189b28 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2cfb3e0589d26cbb8bf569fdf854f6162ff4915 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641200461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Us4ygnfsGZWdi8SRtXq/nRTivWlbg2Feiu20WU6lyUk=; b=Di41qhQ+f+venbYwJ0lnbMqkwI85DE8e0aoHcGb3rTMiJTl/VZJtMXXg8a4QOhjFmxMm6k eFk74R+Dk0GU9ZWK3PCMKa9Dy2MvqNhdv9c7118kmF5BONkkbMNiF+jAwCWr7lHPT99Sea dn74Osl+ChKeOvx3sKuBqPXQt4Eo/nqkuw1KkJng0sMi6dP9t9fDMWzwhhdRnBQ8gfwsnh ETcN4WgpgArYPpbUeLaEKHhJmogS6tS/F7xLs6st2fxfH+S7cznLXiQEYHnvPq1jtIwXZJ fzWzHCQRWHTZ9FxuB7JoxCJcSoN5osETy7xt+tGTvXbJswBlHiYHjlht7HEweQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641200461; a=rsa-sha256; cv=none; b=eD8p4gMywaJnfRu5Y9VylazPtALAIZw3ikIzbiHo31tHZBdXhQhdWpGTIOk5oEu/OKzLYx ypcVTJsTnWIy0ioC3CbBCy05QtD+p3fF3oaxEMQDzucmEh4ViKT+L+phS/Fi9rqUhiVJGH EAZvkdAH5tmSpsm2DGJscGACuLw6M7Gaz2SYpebS6e2NZ49lvP43F2g7uL2BRH70T00HIu c8TjLvn5sWPZnNEIieNAMa95qH/NpqFd47zhO+jIOLuJHDlNMkKXMuNuGxYf4TRQtJ9se3 FTewna70/OS/7FK0zLGgTTjr3pAuMdQDlf3SnbyDPE+Moz1EH5pYgeox2QFxDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=a2cfb3e0589d26cbb8bf569fdf854f6162ff4915 commit a2cfb3e0589d26cbb8bf569fdf854f6162ff4915 Author: Stefan Eßer AuthorDate: 2022-01-03 08:49:26 +0000 Commit: Stefan Eßer CommitDate: 2022-01-03 08:49:26 +0000 math/py-numpy: revert obsolete commit 507c189b28 The sched_getaffinity() function in the C library returned a different error code than expected (i.e. other than returned by GLIBC) if the requested CPU set size did not match the one expected by the system. The error code has been changed from ERANGE to EINVAL as expected by the wrapper for os.sched_getaffinity() in Python, obsoleting the patch that commented out the failing function call in setup.py. --- math/py-numpy/files/patch-numpy_distutils_misc__util.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/math/py-numpy/files/patch-numpy_distutils_misc__util.py b/math/py-numpy/files/patch-numpy_distutils_misc__util.py deleted file mode 100644 index 36f46dc3ae15..000000000000 --- a/math/py-numpy/files/patch-numpy_distutils_misc__util.py +++ /dev/null @@ -1,16 +0,0 @@ ---- numpy/distutils/misc_util.py.orig 2022-01-02 20:27:35 UTC -+++ numpy/distutils/misc_util.py -@@ -92,9 +92,9 @@ def get_num_build_jobs(): - - """ - from numpy.distutils.core import get_distribution -- try: -- cpu_count = len(os.sched_getaffinity(0)) -- except AttributeError: -- cpu_count = multiprocessing.cpu_count() -+# try: -+# cpu_count = len(os.sched_getaffinity(0)) -+# except AttributeError: -+ cpu_count = multiprocessing.cpu_count() - cpu_count = min(cpu_count, 8) - envjobs = int(os.environ.get("NPY_NUM_BUILD_JOBS", cpu_count))