From nobody Sun Jan 02 22:33:22 2022 X-Original-To: dev-commits-src-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 E054B1934113; Sun, 2 Jan 2022 22:33:28 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JRtvD3Nmmz3rLy; Sun, 2 Jan 2022 22:33:28 +0000 (UTC) (envelope-from se@freebsd.org) Received: from [IPV6:2003:cd:5f26:900:6dca:3bde:ffdc:26c9] (p200300cd5f2609006dca3bdeffdc26c9.dip0.t-ipconnect.de [IPv6:2003:cd:5f26:900:6dca:3bde:ffdc:26c9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 3C5CA7607; Sun, 2 Jan 2022 22:33:24 +0000 (UTC) (envelope-from se@freebsd.org) Message-ID: <0890c126-21e4-2fc1-6cb5-a1068ff528ac@freebsd.org> Date: Sun, 2 Jan 2022 23:33:22 +0100 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: git: e2650af157bc - main - Make CPU_SET macros compliant with other implementations Content-Language: en-US From: Stefan Esser To: Antoine Brodin Cc: Konstantin Belousov , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, FreeBSD Ports Management Team References: <202112301154.1BUBsR1q017491@gitrepo.freebsd.org> <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org> In-Reply-To: <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------PCc7jwu2xw0LbIAjBnciDoPY" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641162808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=rKu2KINVJMujlsXN9jafPcqsQGs+grVFcdSwCT1X7VM=; b=e8TOMpJFUnxCfZK86j5gGKjmId8xUv5wSbU8LaL/KjrmceZapbvl03IVFh0OYpm5CMehE5 WiIasRoKTjNmWHdhx9Z2eLIHtiQ3EN3g/CCFBvj/2GxLPtuHPwFWN3RwE/po3pQVEKkQ4n cTgaCNp+itn7YqFdhz2OrkSCRvkwRRVJNJHmmuaQpQjZPwOvl2SjygHdL4kIjRUULJoNZG hW7HRMGGSw0Vt9w5LlwKwIIBnpIcb8MAqJEkW4rm1irPeNsDc3Nla3oGIpe52YtVqJP7P0 wkLWBdIhAxY6jHscOIyI4eINggF1QrK9XBFd9r1N/xUxop24+AajpgCBwrgUNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641162808; a=rsa-sha256; cv=none; b=vw2tRU8RUAfhgzmyy7shH1+4fHjMRQzz1TqVkITNtmVs30sSbeBwB9j8PKGpA0nNoBOkKO PrukI4dqXLSlut0uwdmswiUS6JeEMYZaYTa/rs9+8GSMN6kTUISmFoCyDT4LDXgZdkHVRV cGi/CqXNAVNOeVQIbzztMSYrtWqQaLBKwP4X3RzVS+P+IR1hMzRL1LWCsZ3vuTW93mYOcA XljPXMBep9L5K58Htenu+tTl9AJmite5/DyH/YH+vL5WbOqxQOs0sjWXbMaX5vloM9BarF 76zr3lCyepFp7ScUNtRn3vN7hXse5wT+Zd7uAunHQR9qd+bgD5/nJH4HDfI37A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------PCc7jwu2xw0LbIAjBnciDoPY Content-Type: multipart/mixed; boundary="------------QO4ZdVI6Tmnye987y3QcQfcF"; protected-headers="v1" From: Stefan Esser To: Antoine Brodin Cc: Konstantin Belousov , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, FreeBSD Ports Management Team 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> <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--