cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/squid-devel: Fix build on current with _WITH_CPU_SET_T

Browse Source 
(cherry picked from commit fa91f5445b)
This commit is contained in:
Cy Schubert 2021-11-29 12:34:35 -08:00
parent dea0931f9b
commit 71f9cd469f
3 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/squid-devel/files/patch-compat_cpu.h Normal file
View File

@ -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 <sched.h>
#endif
+#undef CPU_COUNT
+#undef CPU_AND
#if !HAVE_CPU_AFFINITY
/* failing replacements to minimize the number of if-HAVE_CPU_AFFINITYs */

30
www/squid-devel/files/patch-configure
View File

@ -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 <netinet/ip.h>
#endif
#if HAVE_NETINET_IP_COMPAT_H
@ -48,7 +48,15 @@
#include <netinet/ip_compat.h>
#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 <sched.h>
#endif
@@ -42711,6 +42715,7 @@
# include <sys/ioccom.h>
# include <netinet/in.h>
@ -56,7 +64,7 @@
# include <netinet/ip_compat.h>
# include <netinet/ip_fil.h>
# include <netinet/ip_nat.h>
@@ -42606,6 +42610,7 @@ else
@@ -42741,6 +42746,7 @@
# include <sys/ioccom.h>
# include <netinet/in.h>
#undef minor_t
@ -64,7 +72,7 @@
# include <netinet/ip_compat.h>
# include <netinet/ip_fil.h>
# include <netinet/ip_nat.h>
@@ -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 <ip_compat.h>
#elif HAVE_NETINET_IP_COMPAT_H

10
www/squid-devel/files/patch-include_squid.h Normal file
View File

@ -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)