diff --git a/haproxy.spec b/haproxy.spec index cc801eb55a4249ded682e6a3a7cf9888ec3add30..22a82e73cfc180842194bab69ade0fa0a58819c6 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -5,7 +5,7 @@ Name: haproxy Version: 2.6.6 -Release: 4 +Release: 5 Summary: The Reliable, High Performance TCP/HTTP Load Balancer License: GPLv2+ @@ -34,15 +34,18 @@ web sites and powers quite a number of the world's most visited ones. %prep %autosetup -n %{name}-%{version} -p1 %build +%if "%toolchain" == "clang" + %global make_opts HOSTCC=clang CC=clang CXX=clang++ +%endif -%make_build CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE2=1 USE_SLZ=1 \ +%make_build %{?make_opts} CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE2=1 USE_SLZ=1 \ USE_LUA=1 USE_CRYPT_H=1 USE_SYSTEMD=1 USE_LINUX_TPROXY=1 USE_GETADDRINFO=1 USE_PROMEX=1 DEFINE=-DMAX_SESS_STKCTR=12 \ ADDINC="%{build_cflags}" ADDLIB="%{build_ldflags}" -%make_build admin/halog/halog ADDINC="%{build_cflags}" ADDLIB="%{build_ldflags}" +%make_build %{?make_opts} admin/halog/halog ADDINC="%{build_cflags}" ADDLIB="%{build_ldflags}" pushd admin/iprange -%make_build OPTIMIZE="%{build_cflags}" LDFLAGS="%{build_ldflags}" +%make_build %{?make_opts} OPTIMIZE="%{build_cflags}" LDFLAGS="%{build_ldflags}" popd %install @@ -121,6 +124,9 @@ exit 0 %{_mandir}/man1/* %changelog +* Fri Sep 22 2023 yoo - 2.6.6-5 +- support clang build + * Mon Aug 21 2023 wangkai - 2.6.6-4 - Fix CVE-2023-40225