Date: Sun, 2 Jan 2022 22:45:14 +0100 From: Stefan Esser <se@freebsd.org> To: Antoine Brodin <antoine@freebsd.org> Cc: Konstantin Belousov <kib@freebsd.org>, src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, FreeBSD Ports Management Team <portmgr@freebsd.org> Subject: Re: git: e2650af157bc - main - Make CPU_SET macros compliant with other implementations Message-ID: <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org> In-Reply-To: <CAALwa8kn9h%2BKn53RvKX1Vx%2BqFK2Txt-sqj80nTSJUFC1U=8AGg@mail.gmail.com> References: <202112301154.1BUBsR1q017491@gitrepo.freebsd.org> <CAALwa8m3u3xrO3N0j8um57qGTVnMEQwx1gP2YxJbzE5%2BLhbsWA@mail.gmail.com> <d1553b68-23dd-128e-6ac0-6c3c1f66c7cd@freebsd.org> <CAALwa8kn9h%2BKn53RvKX1Vx%2BqFK2Txt-sqj80nTSJUFC1U=8AGg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------UtGHbRG0bnJJDT2A95weMYJ2 Content-Type: multipart/mixed; boundary="------------sO0t5G6JNDmrlt64LjP0siyz"; protected-headers="v1" From: Stefan Esser <se@freebsd.org> To: Antoine Brodin <antoine@freebsd.org> Cc: Konstantin Belousov <kib@freebsd.org>, src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, FreeBSD Ports Management Team <portmgr@freebsd.org> Message-ID: <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org> Subject: Re: git: e2650af157bc - main - Make CPU_SET macros compliant with other implementations References: <202112301154.1BUBsR1q017491@gitrepo.freebsd.org> <CAALwa8m3u3xrO3N0j8um57qGTVnMEQwx1gP2YxJbzE5+LhbsWA@mail.gmail.com> <d1553b68-23dd-128e-6ac0-6c3c1f66c7cd@freebsd.org> <CAALwa8kn9h+Kn53RvKX1Vx+qFK2Txt-sqj80nTSJUFC1U=8AGg@mail.gmail.com> In-Reply-To: <CAALwa8kn9h+Kn53RvKX1Vx+qFK2Txt-sqj80nTSJUFC1U=8AGg@mail.gmail.com> --------------sO0t5G6JNDmrlt64LjP0siyz Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am 02.01.22 um 20:51 schrieb Antoine Brodin: > Hi, >=20 > It seems that the 2 main ports failing are math/py-numpy (503 ports > skipped) and sysutils/slurm-wlm (232 ports skipped) Hi Antoine, thank you for the information! > Failure logs: > http://beefy18.nyi.freebsd.org/data/main-amd64-default/pe2d17ded99d5_s5= 169832c96/logs/errors/py38-numpy-1.20.3,1.log Python 3.8.12 (default, Dec 31 2021, 10:50:47) >>> import os >>> os.sched_getaffinity(0) Traceback (most recent call last): File "<stdin>", line 1, in <module> OSError: [Errno 34] Result too large This is a Python interpreter problem: it seems that the wrapper for the sched_getaffinity() function that has been introduced by kib in <sched.h> is buggy. As a work-around I have added a patch to comment out the os.sched_getaffinity(0) call (which used to cause an Attribute error that was caught by try/except, before). See ports commit 507c189b2876. > http://beefy18.nyi.freebsd.org/data/main-amd64-default/pe2d17ded99d5_s5= 169832c96/logs/errors/slurm-wlm-20.02.7.log This is easily fixed with this patch: --- src/plugins/task/affinity/affinity.c.orig 2021-05-12 20:23:20 UTC +++ src/plugins/task/affinity/affinity.c @@ -297,7 +297,7 @@ void reset_cpuset(cpu_set_t *new_mask, cpu_set_t *cur= _ if (slurm_getaffinity(1, sizeof(full_mask), &full_mask)) { /* Try to get full CPU mask from process init */ CPU_ZERO(&full_mask); -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) && !defined(CPU_ALLOC) CPU_OR(&full_mask, cur_mask); #else CPU_OR(&full_mask, &full_mask, cur_mask); This effectively removes the conditional compilation that was required due to the different CPU_OR signature. BUT: There are many other build issues in this port, that do not depend on the CPU_SET macros. Since the build succeeds on -STABLE, there must be other changes in the build configuration on -CURRENT, which lead to #include of Linux specific headers and try to use pushd/popd in /bin/sh (under the assumption of Bash installed as /bin/sh). I'll look into these issues, but they must be somewhere in the build system, not the sources being compiled. I'm sure that the patch above is required, but I'm not going to commit it right now, since I want to understand the other build issues first. Regards, STefan --------------sO0t5G6JNDmrlt64LjP0siyz-- --------------UtGHbRG0bnJJDT2A95weMYJ2 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAmHSHOoFAwAAAAAACgkQR+u171r99UT2 3wf/YwdxJCIPiQRuBAfLDBsDkAxQz5a+xFPhmSIbwUaYnlLV5jbNCXN3Q9RkrbcSN7jNEZ4Z/oU8 Zj2KmEhR94mTDyM4u49yQko9OWfOEa2J61vaWSCLe1pPL9btzjXEc3Sj/SPX0D2y80xlSgYwGUta F6oJTyyv2LKyUUE5K+7OjyXK3KnqezsZbMwPb3EYSzuVV+r0dJT8Ydy3zeDrj8l49y+h9sBUtOrF REAEwfF/bQ3pt4kdN+rUXd4gN8QPbb8h2mj5431qq02f0BFy1hboeHbcsh9QMFuz7c9RndhyzyIS r7RRl3dhXNOJru/6Tsybne5oubiemmDBP3sjUnlV4w== =VeOS -----END PGP SIGNATURE----- --------------UtGHbRG0bnJJDT2A95weMYJ2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9dffb50a-9374-be91-8007-ce8933571398>