From nobody Sun Jan 02 21:45:14 2022 X-Original-To: dev-commits-src-all@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 2AEAA1928B66; Sun, 2 Jan 2022 21:45:20 +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 4JRsqg6BjRz3hcT; Sun, 2 Jan 2022 21:45:19 +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 570C670DF; Sun, 2 Jan 2022 21:45:18 +0000 (UTC) (envelope-from se@freebsd.org) Message-ID: <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org> Date: Sun, 2 Jan 2022 22:45:14 +0100 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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 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> From: Stefan Esser In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------UtGHbRG0bnJJDT2A95weMYJ2" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641159919; 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=0I4IFLmbXzbf0cWv4W+8RDNbUptFesInKWeZPLL2zYU=; b=pRSHQCPkbN7zR0dV1vj7O+FJKsdkCMvwhpCWam78g5I7hdedU+PqcTO7MsUgZZjO1d9Nw2 0WA6emtntzxj38MkTObi7W1G31Jao6upZtQimjL1ChYIpNBMiN55AnphLgCH33l5PlI6BP seW4eQHfxIrhD+fAiiOgNexDpzp16P6kdbvQ51yReaD6kPG6dnBtlBDv4RIzecpjJVVAcU 99SSKeBcppLEhYkbWlRZtylr1i31EvKIVOT0z/5kYR7c6naShlmnMpf+SudZsS2ejfpUGp qJPUIDXLATXDrANrUOgBlNu4ZEF24ocaJTUBzsgFpufAqDGfUCTWRs8SZnOvOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641159919; a=rsa-sha256; cv=none; b=dVQBKSKEs+7L+MUyh/2xlYLPrGNeGfuei+eAKl5nHGB63uT8iXOD1b5Uk5nLrLmLsZ8AAK Y11F65u1kT95/4iQWIbri7Gl3y87WOHJCDrh7QfXxrpl2Adk6z0UzZy5lAEZFfeuL2nKpG mqNE459mw8Bbd5DQ/0kXEWIKa0EcWBC3+BIokfkLxrlQDPSZKWvyP2x5bbue7KY5eDVV9F 9w2Su2gZM61v+kAT9xWTUcye5EBTm1tSpSm3OATPDYVHBJs7/Dpzp4nhvcXZ6ga966MS4P 3BMBIPSE9JZuVXiB8Na7WXfcAjNI6CWQOWJnpBdUIHwJZkTU3qr6k39oF4Wxww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------UtGHbRG0bnJJDT2A95weMYJ2 Content-Type: multipart/mixed; boundary="------------sO0t5G6JNDmrlt64LjP0siyz"; 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: <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> In-Reply-To: --------------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 "", line 1, in 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 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--