From nobody Mon Nov 29 20:56:13 2021 X-Original-To: dev-commits-ports-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 1304E18C62D5; Mon, 29 Nov 2021 20:56:16 +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 4J2yLk0WkWz4cBP; Mon, 29 Nov 2021 20:56:13 +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 60B9C1693; Mon, 29 Nov 2021 20:56:13 +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 1ATKuDaH081305; Mon, 29 Nov 2021 20:56:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATKuDDf081304; Mon, 29 Nov 2021 20:56:13 GMT (envelope-from git) Date: Mon, 29 Nov 2021 20:56:13 GMT Message-Id: <202111292056.1ATKuDDf081304@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 9be82b2f4132 - main - www/squid: Fix build on current with _WITH_CPU_SET_T List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 9be82b2f413287fcb193ec19b23b1ed62f3fc2d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638219374; 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=OVqW+vpTRYUfa22ueh+AJiqhflEC5MJQgtD5Ip0hxmw=; b=p0GVeqzlvsCWwzLY3JXyCR08miLRrBEi6bAtqvLerfwx/Srw3rSVSfytJzBTmrLRf3MdAF 3bFzfWqi2ZBRZIllM4rrOMRimG9vbXyw7sBdr5djZusrN9OBDBOnyy9MwiaWBr9hP0+a86 gP0xftCrbqbP0EGHLTLJKOlvaPTlJv/6h1+xlj22WHFkjyEpXJGu6/pLt6QcowsXWGHv/q Zja465lclCDT4UxmxlJFMafZ2qW0lGm3yad2ATpnuQdnJ/ktwL9MLLgsxP3lO0c+4EwS/b tljVTEAcfNLVxFHS57DXbu5L4+YHgp4EkWxN+AHXIN/Qc+tu+mmJ5bL32g2PzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638219374; a=rsa-sha256; cv=none; b=R6yTPk5te9NwtdwDdn/iSeik/VLrm9lBAQ/ybOJt/uzExBKDpPR50i+JbhnJF9xf6BozVa Eu90PL3fzFfmZQQxdIYkB8ERqlHU6nKefu8xyRsbmwKcC9tJ9gjWYt3cgzG4MEmLnr8VeH 6ydNOuzsl5JGVbyQ1ohdAcmT6K3PSuVs4P3gqDl9MuUwvJPSLH72STCUHECXfNTxiOFo/r So0Fl9HVIut+DLrnFMiXmId6Y0KL3U9pZIajE9ot8v15kIgsuWT2YdNzDp1zTbygHPMjY+ fivnDJTXYPlOKC9O+jjJ58VgwGHCXHMXEhRbEns65RyvwE+Lhvg85iFYg0cjbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9be82b2f413287fcb193ec19b23b1ed62f3fc2d7 commit 9be82b2f413287fcb193ec19b23b1ed62f3fc2d7 Author: Cy Schubert AuthorDate: 2021-11-29 20:33:34 +0000 Commit: Cy Schubert CommitDate: 2021-11-29 20:55:19 +0000 www/squid: Fix build on current with _WITH_CPU_SET_T MFH after: 1 week --- www/squid/files/patch-compat_cpu.h | 11 +++++++++++ www/squid/files/patch-configure | 30 +++++++++++++++++++----------- www/squid/files/patch-include_squid.h | 10 ++++++++++ 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/www/squid/files/patch-compat_cpu.h b/www/squid/files/patch-compat_cpu.h new file mode 100644 index 000000000000..4df40e6b26b4 --- /dev/null +++ b/www/squid/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/files/patch-configure b/www/squid/files/patch-configure index 75d767667ada..ad7f6f291bc2 100644 --- a/www/squid/files/patch-configure +++ b/www/squid/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2020-06-09 07:15:48 UTC -+++ configure -@@ -35092,7 +35092,7 @@ done +--- configure.orig 2021-05-10 03:35:34.000000000 -0700 ++++ configure 2021-11-29 12:11:20.139764000 -0800 +@@ -35087,7 +35087,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" " -@@ -35107,8 +35107,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +@@ -35102,8 +35102,10 @@ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -22,7 +22,7 @@ fi done -@@ -35581,7 +35583,7 @@ done +@@ -35576,7 +35578,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" -@@ -37973,7 +37975,7 @@ for ac_header in \ +@@ -37982,7 +37984,7 @@ arpa/nameser.h \ assert.h \ bstring.h \ @@ -40,7 +40,7 @@ ctype.h \ direct.h \ errno.h \ -@@ -38181,6 +38183,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" +@@ -38190,6 +38192,7 @@ #include #endif #if HAVE_NETINET_IP_COMPAT_H @@ -48,7 +48,15 @@ #include #endif #if HAVE_NETINET_IP_FIL_H -@@ -42228,6 +42231,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then +@@ -39490,6 +39493,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 + +@@ -42237,6 +42241,7 @@ # include # include @@ -56,7 +64,7 @@ # include # include # include -@@ -42258,6 +42262,7 @@ else +@@ -42267,6 +42272,7 @@ # include # include #undef minor_t @@ -64,7 +72,7 @@ # include # include # include -@@ -42302,6 +42307,7 @@ _ACEOF +@@ -42311,6 +42317,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 \ -@@ -42331,6 +42337,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" +@@ -42340,6 +42347,7 @@ #if HAVE_IP_COMPAT_H #include #elif HAVE_NETINET_IP_COMPAT_H diff --git a/www/squid/files/patch-include_squid.h b/www/squid/files/patch-include_squid.h new file mode 100644 index 000000000000..85951b1b6e02 --- /dev/null +++ b/www/squid/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)