From ab3358655c604f7831651c09ac127bf9b0da88b0 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 17 May 2021 23:45:46 +0000 Subject: [PATCH] squid: Fix build with GCC 11 Signed-off-by: Michael Tremer --- lfs/squid | 1 + src/patches/squid-gcc11.patch | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/patches/squid-gcc11.patch diff --git a/lfs/squid b/lfs/squid index 3e6342996..7766f3fc5 100644 --- a/lfs/squid +++ b/lfs/squid @@ -77,6 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid-gcc11.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/squid-gcc11.patch b/src/patches/squid-gcc11.patch new file mode 100644 index 000000000..c87ade51a --- /dev/null +++ b/src/patches/squid-gcc11.patch @@ -0,0 +1,24 @@ +diff --git a/src/acl/ConnMark.cc b/src/acl/ConnMark.cc +index 1fdae0c..213cf39 100644 +--- a/src/acl/ConnMark.cc ++++ b/src/acl/ConnMark.cc +@@ -15,6 +15,7 @@ + #include "Debug.h" + #include "http/Stream.h" + #include "sbuf/Stream.h" ++#include + + bool + Acl::ConnMark::empty() const +diff --git a/src/security/ServerOptions.cc b/src/security/ServerOptions.cc +index 5cd81ab..3f73892 100644 +--- a/src/security/ServerOptions.cc ++++ b/src/security/ServerOptions.cc +@@ -6,6 +6,7 @@ + * Please see the COPYING and CONTRIBUTORS files for details. + */ + ++#include + #include "squid.h" + #include "anyp/PortCfg.h" + #include "base/Packable.h" -- 2.39.2