From nobody Mon Jan 3 10:46:27 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 DB1341930B02; Mon, 3 Jan 2022 10:46:27 +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 4JSC8z4RQgz4rjl; Mon, 3 Jan 2022 10:46:27 +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 784E423EA6; Mon, 3 Jan 2022 10:46:27 +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 203AkRpe012396; Mon, 3 Jan 2022 10:46:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203AkRGU012395; Mon, 3 Jan 2022 10:46:27 GMT (envelope-from git) Date: Mon, 3 Jan 2022 10:46:27 GMT Message-Id: <202201031046.203AkRGU012395@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: 2913605c79b2 - main - net/haproxy: 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: 2913605c79b25b88a4a21b3d93ec2ab11949eaaa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641206787; 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=NptdYCYIn5odynfAWg9fKmHwNa4Jf+fVj04LMitQsf8=; b=RV8UArSEcNLpSpn353Vc2eX02bFyvt8zLqOm7nd9ZBDqxSum9Nco+Y0ydT3rCJJiDojJNh /HqJfWRpjuoOn4zUMIoL3vLh9cY7gv7P5z3pgP0+UgNwe+Eka2wcfLtrWekMIbD62hwA9R GifpOUqGbf6cLVugA0JS91RFBX523wuY7638Sq3vCufhxdoax2LHPWIuBe5r+DQlkqYf9d MNAM41LXKUgCrgWh7oJcxb9oFXm078GRl8ULJfdkn2aw1jlGW7E7vjQ2QWSE7rwZLuFvYL Fc8Ps9hclonU1SFD+e51un5vKzuN16CRBphFRg6PpKxTkpD8tSw/mNkKxEy8BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641206787; a=rsa-sha256; cv=none; b=oMagjee9N3ja/oANKHE9l3a3BA/dcumOcmqkGlMcIvPWADYxUnLubGYvZ5WRwjqeyun6jj 9OXU9gchkSkdbjCmPE9tORx4CCc4FN8dtYNYlPJXGKQ8LWf9DYFAbRv0XGNylbTmvLbbaP LbxC9rf+AKyeM/fOF9EiBqqWspjl0fnErMEEHg/YnCbuJ7/VpB6XKVFu3ujMJYgYM/msVD OHg6ubYDHXIDMkZ+Js7CYKZfTOKRWJ74ezfz9kN/o6PgoXlCrBEixYuUBTrjf6nuTIy/mT yZ7VnKFZHo6f+8xK7xRIxQr4U2EAO7dprPii/bkGlchUZizbONRX6yWUcEZmWA== 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=2913605c79b25b88a4a21b3d93ec2ab11949eaaa commit 2913605c79b25b88a4a21b3d93ec2ab11949eaaa Author: Stefan Eßer AuthorDate: 2022-01-03 10:45:57 +0000 Commit: Stefan Eßer CommitDate: 2022-01-03 10:45:57 +0000 net/haproxy: fix build on -CURRENT The CPU_SET macros in -CURRENT have been made compatible with GLIBC. A simple test for the new signature of CPU_AND, CPU_OR, ... is the existence of a CPU_ALLOC macro. Approved by: portmgr (implicit) MFH: 2022Q1 --- net/haproxy/files/patch-src_cpuset.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/net/haproxy/files/patch-src_cpuset.c b/net/haproxy/files/patch-src_cpuset.c new file mode 100644 index 000000000000..42f04b37e6f6 --- /dev/null +++ b/net/haproxy/files/patch-src_cpuset.c @@ -0,0 +1,14 @@ +--- src/cpuset.c.orig 2021-12-23 16:47:51 UTC ++++ src/cpuset.c +@@ -53,7 +53,11 @@ void ha_cpuset_and(struct hap_cpuset *dst, const struc + CPU_AND(&dst->cpuset, &dst->cpuset, &src->cpuset); + + #elif defined(CPUSET_USE_FREEBSD_CPUSET) ++#if defined(CPU_ALLOC) ++ CPU_AND(&dst->cpuset, &dst->cpuset, &src->cpuset); ++#else + CPU_AND(&dst->cpuset, &src->cpuset); ++#endif + + #elif defined(CPUSET_USE_ULONG) + dst->cpuset &= src->cpuset;