git: 91efb4d016bc - main - net/haproxy-devel: fix build on -CURRENT

From: Stefan Eßer <se_at_FreeBSD.org>
Date: Mon, 03 Jan 2022 10:55:24 UTC
The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/ports/commit/?id=91efb4d016bcb7953f00a022f6bfe49a84dc61ac

commit 91efb4d016bcb7953f00a022f6bfe49a84dc61ac
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-01-03 10:55:01 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-01-03 10:55:01 +0000

    net/haproxy-devel: 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-devel/files/patch-src_cpuset.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/net/haproxy-devel/files/patch-src_cpuset.c b/net/haproxy-devel/files/patch-src_cpuset.c
new file mode 100644
index 000000000000..42f04b37e6f6
--- /dev/null
+++ b/net/haproxy-devel/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;