From nobody Fri Dec 10 04:42:02 2021 X-Original-To: dev-commits-ports-branches@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 6F96518DD2E3; Fri, 10 Dec 2021 04:42:04 +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 4J9JCb2D6Mz3P6C; Fri, 10 Dec 2021 04:42:03 +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 13611144B8; Fri, 10 Dec 2021 04:42:03 +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 1BA4g2un035836; Fri, 10 Dec 2021 04:42:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA4g2Z6035835; Fri, 10 Dec 2021 04:42:02 GMT (envelope-from git) Date: Fri, 10 Dec 2021 04:42:02 GMT Message-Id: <202112100442.1BA4g2Z6035835@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 71f9cd469f18 - 2021Q4 - www/squid-devel: Fix build on current with _WITH_CPU_SET_T List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 71f9cd469f18ffbb7c9c06092183f118001535e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639111323; 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=uLq1bj8A1MZzk1fSNizfmbHy5OZgPVFX4pxa/KWW60E=; b=GV4DbcF8OqfdpxXlOr9nNbHWBZxfBT6dcmrxeIml8Wg+3v2lUTAnzAfdIDFyBbmJnteraH TnFi2sUPNUYYQUlvy5FRLuMlMuTecSSfnqepMO/ztuFpEO4uVf/wKvLgv1dP+p+UHeOec/ HPHCLVuA2SiyN5eooZMs+7yek3hTiJfEKpScJye/TWTBt1HMcMWckAKSETAXGl37tMo1Ej TKLnxnJ17Ygu34Tm1U1WbpD3mEOnyR1quUylCY3iEisb/tUnRZwOR00Sn2+SMRcW/tRK3Q 7+vETJDMMcu3/BMqM1tYLTc8COPXMzOBCnArXSmc7t1KHJOX8OnubajRGMSitA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639111323; a=rsa-sha256; cv=none; b=NwQX7iZXS/hqxtMq2SDhHXjMmSlRLqk8eCR7te9vK0CT9R/+CH1yue7MGltZE49NgEDX9z EaPOls1ydz/3RyhbS5u1zpZmRhLy0BFYz9gF+W32w37GH2msRIThzdVjSlvpu5KNCXheEG A/kiGKZrXTsP6+U9Aut9DRzx89naaWNqIx8EN+LdFLcM8IKDBc64ny4uGJMjgwBXz/Ibb2 RPWmCO00In1XWIQpfsoRcLcJFBCb6CK6RYQaD5m/4GZmbXE6mo0kGVHxv8VOZM0x/e3zQH t5RCBTGSumLlKsc2wW+uyP6ttV/QZA/cM56brmi7QD61RdB49ZALwg97fta9lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=71f9cd469f18ffbb7c9c06092183f118001535e0 commit 71f9cd469f18ffbb7c9c06092183f118001535e0 Author: Cy Schubert AuthorDate: 2021-11-29 20:34:35 +0000 Commit: Cy Schubert CommitDate: 2021-12-10 04:32:39 +0000 www/squid-devel: Fix build on current with _WITH_CPU_SET_T (cherry picked from commit fa91f5445b0a7d26afc1c7390b3a06b97763b370) --- www/squid-devel/files/patch-compat_cpu.h | 11 +++++++++++ www/squid-devel/files/patch-configure | 30 ++++++++++++++++++----------- www/squid-devel/files/patch-include_squid.h | 10 ++++++++++ 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/www/squid-devel/files/patch-compat_cpu.h b/www/squid-devel/files/patch-compat_cpu.h new file mode 100644 index 000000000000..4df40e6b26b4 --- /dev/null +++ b/www/squid-devel/files/patch-compat_cpu.h @@ -0,0 +1,11 @@ +--- compat/cpu.h.orig 2021-05-10 02:02:34.000000000 -0700 ++++ compat/cpu.h 2021-11-29 10:31:25.381434000 -0800 +@@ -15,6 +15,8 @@ + #if HAVE_SCHED_H + #include + #endif ++#undef CPU_COUNT ++#undef CPU_AND + + #if !HAVE_CPU_AFFINITY + /* failing replacements to minimize the number of if-HAVE_CPU_AFFINITYs */ diff --git a/www/squid-devel/files/patch-configure b/www/squid-devel/files/patch-configure index c39baaf07785..ff5859d9d8db 100644 --- a/www/squid-devel/files/patch-configure +++ b/www/squid-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2020-06-09 06:58:26 UTC -+++ configure -@@ -35068,7 +35068,7 @@ done +--- configure.orig 2021-05-10 03:57:57.000000000 -0700 ++++ configure 2021-11-28 20:55:00.866132000 -0800 +@@ -35189,7 +35189,7 @@ ## BUILD_HELPER="NIS" @@ -9,7 +9,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " -@@ -35083,8 +35083,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +@@ -35204,8 +35204,10 @@ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -22,7 +22,7 @@ fi done -@@ -35557,7 +35559,7 @@ done +@@ -35678,7 +35680,7 @@ # unconditionally requires crypt(3), for now if test "x$ac_cv_func_crypt" != "x"; then @@ -31,7 +31,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -@@ -38321,7 +38323,7 @@ for ac_header in \ +@@ -38456,7 +38458,7 @@ arpa/nameser.h \ assert.h \ bstring.h \ @@ -40,7 +40,7 @@ ctype.h \ direct.h \ errno.h \ -@@ -38529,6 +38531,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" +@@ -38664,6 +38666,7 @@ #include #endif #if HAVE_NETINET_IP_COMPAT_H @@ -48,7 +48,15 @@ #include #endif #if HAVE_NETINET_IP_FIL_H -@@ -42576,6 +42579,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then +@@ -39964,6 +39967,7 @@ + + ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" " + #if HAVE_SCHED_H ++#define _WITH_CPU_SET_T + #include + #endif + +@@ -42711,6 +42715,7 @@ # include # include @@ -56,7 +64,7 @@ # include # include # include -@@ -42606,6 +42610,7 @@ else +@@ -42741,6 +42746,7 @@ # include # include #undef minor_t @@ -64,7 +72,7 @@ # include # include # include -@@ -42650,6 +42655,7 @@ _ACEOF +@@ -42785,6 +42791,7 @@ ip_fil_compat.h \ ip_fil.h \ ip_nat.h \ @@ -72,7 +80,7 @@ netinet/ip_compat.h \ netinet/ip_fil_compat.h \ netinet/ip_fil.h \ -@@ -42679,6 +42685,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" +@@ -42814,6 +42821,7 @@ #if HAVE_IP_COMPAT_H #include #elif HAVE_NETINET_IP_COMPAT_H diff --git a/www/squid-devel/files/patch-include_squid.h b/www/squid-devel/files/patch-include_squid.h new file mode 100644 index 000000000000..85951b1b6e02 --- /dev/null +++ b/www/squid-devel/files/patch-include_squid.h @@ -0,0 +1,10 @@ +--- include/squid.h.orig 2021-05-10 02:02:34.000000000 -0700 ++++ include/squid.h 2021-11-29 08:48:04.020714000 -0800 +@@ -9,6 +9,7 @@ + #ifndef SQUID_CONFIG_H + #define SQUID_CONFIG_H + ++#define _WITH_CPU_SET_T + #include "autoconf.h" /* For GNU autoconf variables */ + + #if !defined(HAVE_SQUID)