From f173990dec30aab339cd3826348062df14a7bf45 Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 3 Feb 2023 10:47:26 -0500 Subject: [PATCH] squid: update to 5.7, patch for cross-compile --- srcpkgs/squid/patches/001-cross_compile.patch | 28 +++++++++++++++++++ srcpkgs/squid/template | 4 +-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/squid/patches/001-cross_compile.patch diff --git a/srcpkgs/squid/patches/001-cross_compile.patch b/srcpkgs/squid/patches/001-cross_compile.patch new file mode 100644 index 000000000000..50dc07954400 --- /dev/null +++ b/srcpkgs/squid/patches/001-cross_compile.patch @@ -0,0 +1,28 @@ +From: https://raw.githubusercontent.com/hongkongkiwi/openwrt-squid/master/patches/001-cross_compile.patch + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -7761,3 +7761,3 @@ cache_cf.o: cf_parser.cci + cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci +- $(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src ++ g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src + +--- a/configure ++++ b/configure +@@ -20133,3 +20133,3 @@ if test "$cross_compiling" = yes; then : + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling ++_as_fn_error $? "cannot run test program while cross compiling + See \`config.log' for more details" "$LINENO" 5; } +@@ -28289,3 +28289,3 @@ else + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling ++_as_fn_error $? "cannot run test program while cross compiling + See \`config.log' for more details" "$LINENO" 5; } +@@ -28314,3 +28314,3 @@ else + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling ++_as_fn_error $? "cannot run test program while cross compiling + See \`config.log' for more details" "$LINENO" 5; } + + diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template index 626972525bc0..3306180dbec7 100644 --- a/srcpkgs/squid/template +++ b/srcpkgs/squid/template @@ -1,6 +1,6 @@ # Template file for 'squid' pkgname=squid -version=5.3 +version=5.7 revision=1 build_style=gnu-configure configure_args=" @@ -65,7 +65,7 @@ license="GPL-2.0-or-later" homepage="http://www.squid-cache.org/" changelog="http://www.squid-cache.org/Versions/v5/changesets/" distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz" -checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715 +checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81 system_accounts="squid" # squid-conf-tests requires a squid user in the system make_check=no