From 325e3ebf420e872f2c35dc242736d09bd9da8063 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 19 Jun 2017 23:47:01 -0700 Subject: squid: Upgrade to 3.5.26 Fix build errors with gcc7 along the way Signed-off-by: Khem Raj Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../recipes-daemons/squid/files/gcc7-fixes.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch (limited to 'meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch') diff --git a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch b/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch new file mode 100644 index 0000000000..cc1ea78a55 --- /dev/null +++ b/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch @@ -0,0 +1,17 @@ +../../squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc: In function 'void squidaio_init()': ../../squid-3.5.26/src/DiskIO/DiskThreads/DiskThreads.h:30:50: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] #define NUMTHREADS (Config.cacheSwap.n_configured*16) + + +Upstream-Status: Backport +Index: squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc +=================================================================== +--- squid-3.5.26.orig/src/DiskIO/DiskThreads/aiops.cc ++++ squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc +@@ -290,7 +290,7 @@ squidaio_init(void) + /* Create threads and get them to sit in their wait loop */ + squidaio_thread_pool = memPoolCreate("aio_thread", sizeof(squidaio_thread_t)); + +- assert(NUMTHREADS); ++ assert(NUMTHREADS != 0); + + for (i = 0; i < NUMTHREADS; ++i) { + threadp = (squidaio_thread_t *)squidaio_thread_pool->alloc(); -- cgit 1.2.3-korg