rpm/haproxy
SHA256
1
0
Fork 0
forked from pool/haproxy
Code Pull Requests Activity

Accepting request 1010887 from home:coolo:branches:openSUSE:Factory

Browse Source 
- Switch from unmaintained pcre 8.45 to pcre2 10

OBS-URL: https://build.opensuse.org/request/show/1010887
OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=272
This commit is contained in:
Marcus Rückert 2022-11-22 13:12:10 +00:00 committed by Git OBS Bridge
parent 44022b3ab7
commit 53b24469e2
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
haproxy.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 14 11:20:34 UTC 2022 - Stephan Kulow <coolo@suse.com>
- Switch from unmaintained pcre 8.45 to pcre2 10
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 13:19:38 UTC 2022 - mrueckert@suse.de Mon Sep 26 13:19:38 UTC 2022 - mrueckert@suse.de

14
haproxy.spec
View File

@ -35,11 +35,7 @@
%bcond_with systemd %bcond_with systemd
%endif %endif
%if 0%{?suse_version} > 1140 %bcond_with pcre2_jit
%bcond_without pcre_jit
%else
%bcond_with pcre_jit
%endif
%bcond_without apparmor %bcond_without apparmor
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
@ -76,7 +72,7 @@ BuildRequires: libgcrypt-devel
%if %{with lua} %if %{with lua}
BuildRequires: lua-devel >= 5.3 BuildRequires: lua-devel >= 5.3
%endif %endif
BuildRequires: pcre-devel BuildRequires: pcre2-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pkg-config BuildRequires: pkg-config
@ -143,9 +139,9 @@ the most work done from every CPU cycle.
make %{?_smp_mflags} \ make %{?_smp_mflags} \
TARGET=linux-glibc \ TARGET=linux-glibc \
CPU="%{_target_cpu}" \ CPU="%{_target_cpu}" \
USE_PCRE=1 \ USE_PCRE2=1 \
%if %{with pcre_jit} %if %{with pcre2_jit}
USE_PCRE_JIT=1 \ USE_PCRE2_JIT=1 \
%endif %endif
%ifarch %ix86 %ifarch %ix86
USE_REGPARM=1 \ USE_REGPARM=1 \