From nobody Sun Jan 02 22:26:06 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 3018B193223F; Sun, 2 Jan 2022 22:26:07 +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 4JRtkk61J8z3pP1; Sun, 2 Jan 2022 22:26:06 +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 AE39F1A31A; Sun, 2 Jan 2022 22:26:06 +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 202MQ6Kg024854; Sun, 2 Jan 2022 22:26:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 202MQ6ZR024853; Sun, 2 Jan 2022 22:26:06 GMT (envelope-from git) Date: Sun, 2 Jan 2022 22:26:06 GMT Message-Id: <202201022226.202MQ6ZR024853@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: addda1277abe - main - sysutils/slurm-wlm: fix build on -CURRENT 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: addda1277abed746f93ad76aecc2a2e9bc97d033 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641162366; 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=/+pkIT9P2y+PZoT794QxZCVod8ILRlfHHA44iZBSak4=; b=vPcdRzR1jSFR85cw+mhyumeTV5fzvsuNCGJwfqp2QC1a3Mu+RfLbUbhulG38fHQNz6ZyjN MkVMCY9sI1MLV6+Fv/aEcr5c6gn6159kRsFopE8YOygzQSfzqYl0yiuRZz6RfkLkoSrtK3 +o0zK08vmCAnZ2rQqJARelXzNh6TjgrvohWvZecCAspCMuVNwUfq1Y1ZwUNBB8iXMbUkWP Uet9kN4k+0gkXSOWgDWnWsEiA4ysArGDRDqZ+O3oVxmEEBEWWjhIR98ZV9k4B2yzFgO5dG Y+szs4Nte95R5mAELrOoJ5Mom7K6+YIiXCx/o+c+LUxr+WXsVLTXKC1y7vlEpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641162366; a=rsa-sha256; cv=none; b=JQW/GleoAp1iXnDkQMSbZ8CmQDAEPBjD7sDzOd5mH24v9pIChhB9vgvQe34pn4eMTwBSem kKP0oQbNkJ/pQgr1F1zsJIwddnYBr/AHovc6Bze0/TArK7crKJc5hdW4EfeI6smrFQjFpf qNcQTwq3CHlufXCClVuAd/oeLqTo2mlFR4QjmRZnHYJ8TyGcIZqUxUaKZcmeaQdipADh8p ArR347tkqwjs2cKznAziSSHL/LSyYo9Hotu15WtFIUNAJzaabmEY8Qwb71KLwJXCMIurc/ 0A9b7ZRhOCOUeFbwxMeF3FHK58pm6YiFqtlktmUOg8VWM3Srrrl2I6j3fw6/dw== 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=addda1277abed746f93ad76aecc2a2e9bc97d033 commit addda1277abed746f93ad76aecc2a2e9bc97d033 Author: Stefan Eßer AuthorDate: 2022-01-02 22:02:21 +0000 Commit: Stefan Eßer CommitDate: 2022-01-02 22:25:52 +0000 sysutils/slurm-wlm: fix build on -CURRENT The CPU_OR macro has been made compatible with GLIBC on -CURRENT, the FreeBSD specific alternative is therefore no longer required. While here pass --disable-slurmrestd to prevent the auto-configure script from attempting to build slurmrestd if glib is found by auto-configure (it does not build on FreeBSD due to Linux specific headers and shell features provided by Bash but by the /bin/sh in FreeBSD). This port has numerous build issues when not building in a clean jail (i.e. on a system with a previous version installed or with other software that is detected by auto-configure). The port revision is not bumped since these changes do not modify the package that is generated. --- sysutils/slurm-wlm/Makefile | 3 ++- .../files/patch-src_plugins_task_affinity_affinity.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index 517b38320bd3..f3dd6e9c9b11 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -77,7 +77,8 @@ RRD_CONFIGURE_WITH= rrdtool # --docdir is non-functional # CONFIGURE_ARGS= --docdir=${DOCSDIR} # FreeBSD Infiniband support is still experimental -CONFIGURE_ARGS= --without-ofed +# slurmrestd does not build on FreeBSD +CONFIGURE_ARGS= --without-ofed --disable-slurmrestd DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include -fcommon diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_task_affinity_affinity.c b/sysutils/slurm-wlm/files/patch-src_plugins_task_affinity_affinity.c new file mode 100644 index 000000000000..cf09d539002c --- /dev/null +++ b/sysutils/slurm-wlm/files/patch-src_plugins_task_affinity_affinity.c @@ -0,0 +1,11 @@ +--- 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);