Resolves: #1988122 - Enable LTO build of squid for RHEL 9

This commit is contained in:
Luboš Uhliarik 2021-09-16 01:06:17 +02:00
parent cec427378e
commit f8c8fbfbdd
2 changed files with 32 additions and 4 deletions

View File

@ -0,0 +1,24 @@
diff --git a/src/tests/testStoreHashIndex.cc b/src/tests/testStoreHashIndex.cc
index 0564380..fcd60b9 100644
--- a/src/tests/testStoreHashIndex.cc
+++ b/src/tests/testStoreHashIndex.cc
@@ -102,6 +102,8 @@ void commonInit()
if (inited)
return;
+ inited = true;
+
Mem::Init();
Config.Store.avgObjectSize = 1024;
@@ -109,6 +111,10 @@ void commonInit()
Config.Store.objectsPerBucket = 20;
Config.Store.maxObjectSize = 2048;
+
+ Config.memShared.defaultTo(false);
+
+ Config.store_dir_select_algorithm = xstrdup("round-robin");
}
/* TODO make this a cbdata class */

View File

@ -2,7 +2,7 @@
Name: squid Name: squid
Version: 5.1 Version: 5.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code # See CREDITS for breakdown of non GPLv2+ code
@ -39,6 +39,8 @@ Patch205: squid-5.0.5-symlink-lang-err.patch
Patch206: squid-5.0.6-openssl3.patch Patch206: squid-5.0.6-openssl3.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1969322 # https://bugzilla.redhat.com/show_bug.cgi?id=1969322
Patch207: squid-5.0.6-active-ftp.patch Patch207: squid-5.0.6-active-ftp.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1988122
Patch208: squid-5.1-test-store-cppsuite.patch
# cache_swap.sh # cache_swap.sh
Requires: bash gawk Requires: bash gawk
@ -111,15 +113,14 @@ lookup program (dnsserver), a program for retrieving FTP data
%patch205 -p1 -R -b .symlink-lang-err %patch205 -p1 -R -b .symlink-lang-err
%patch206 -p1 -b .openssl3 %patch206 -p1 -b .openssl3
%patch207 -p1 -b .active-ftp %patch207 -p1 -b .active-ftp
%patch208 -p1 -b .test-store-cpp
# https://bugzilla.redhat.com/show_bug.cgi?id=1679526 # https://bugzilla.redhat.com/show_bug.cgi?id=1679526
# Patch in the vendor documentation and used different location for documentation # Patch in the vendor documentation and used different location for documentation
sed -i 's|@SYSCONFDIR@/squid.conf.documented|%{_pkgdocdir}/squid.conf.documented|' src/squid.8.in sed -i 's|@SYSCONFDIR@/squid.conf.documented|%{_pkgdocdir}/squid.conf.documented|' src/squid.8.in
%build %build
# This package fails its testsuite when LTO is enabled. This needs further
# investigation
%define _lto_cflags %{nil}
# NIS helper has been removed because of the following bug # NIS helper has been removed because of the following bug
# https://bugzilla.redhat.com/show_bug.cgi?id=1531540 # https://bugzilla.redhat.com/show_bug.cgi?id=1531540
@ -345,6 +346,9 @@ fi
%changelog %changelog
* Wed Sep 15 2021 Luboš Uhliarik <luhliari@redhat.com> - 7:5.1-3
- Resolves: #1988122 - Enable LTO build of squid for RHEL 9
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 7:5.1-2 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 7:5.1-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688