Date: Sun, 2 Jan 2022 23:33:22 +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: <0890c126-21e4-2fc1-6cb5-a1068ff528ac@freebsd.org> In-Reply-To: <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org> 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> <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------PCc7jwu2xw0LbIAjBnciDoPY Content-Type: multipart/mixed; boundary="------------QO4ZdVI6Tmnye987y3QcQfcF"; 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: <0890c126-21e4-2fc1-6cb5-a1068ff528ac@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> <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org> In-Reply-To: <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org> --------------QO4ZdVI6Tmnye987y3QcQfcF Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am 02.01.22 um 22:45 schrieb Stefan Esser: > Am 02.01.22 um 20:51 schrieb Antoine Brodin: [...] >> http://beefy18.nyi.freebsd.org/data/main-amd64-default/pe2d17ded99d5_s= 5169832c96/logs/errors/slurm-wlm-20.02.7.log >=20 > This is easily fixed with this patch: >=20 > --- 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 *c= ur_ > 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); >=20 > This effectively removes the conditional compilation that was > required due to the different CPU_OR signature. >=20 > BUT: There are many other build issues in this port, that do not > depend on the CPU_SET macros. >=20 > 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). >=20 > I'll look into these issues, but they must be somewhere in the > build system, not the sources being compiled. >=20 > 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. I have committed the patch as addda1277abe, together with a small change that prevents the configure script from enabling the build of slurmrestd if GLIB is found (as may be the case when building with "make" in the port directory instead of with poudriere). Regards, STefan --------------QO4ZdVI6Tmnye987y3QcQfcF-- --------------PCc7jwu2xw0LbIAjBnciDoPY Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAmHSKDIFAwAAAAAACgkQR+u171r99UQ0 nQf7Bu9HfXQftQWxdqDbzSPUCAbg3wqY2+bYFIHW+mX1oMuYYM9FbZIzYl1BEP2v2+NIlQzP106W R0snI3JarZbpwG5JDTljYaTSN2sVoZGzEm4RxnTSlZMpB9JhZTF8TkGgPbzop09yJ1cDKn2ZymNn +xUuzVB9gI++IELwL/UBi1JgB60Y8qsXuk2i20XqiEVpPer4kdcJEoEJUyjFc72kHU2At2+R7chz ovoIo85eagGnwBpwMjlTuxQ4fS1cu/hszdkPYI6LFAOywpL+H0K4/n2M7UEfgjdGu24i9ARgjCI+ 3e44vTvWFF67HgxGbMndhzDTqfQ/6swH967vYoWMyQ== =L1+2 -----END PGP SIGNATURE----- --------------PCc7jwu2xw0LbIAjBnciDoPY--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0890c126-21e4-2fc1-6cb5-a1068ff528ac>