pool/haproxy
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1037297 from server:http

Browse Source 
- reenable the pcre jit after the last change 

- Switch from unmaintained pcre 8.45 to pcre2 10

OBS-URL: https://build.opensuse.org/request/show/1037297
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haproxy?expand=0&rev=123
This commit is contained in:
Dominique Leuenberger 2022-11-22 15:11:08 +00:00 committed by Git OBS Bridge
commit b1f041a743
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
haproxy.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Nov 22 13:13:45 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
- reenable the pcre jit after the last change
-------------------------------------------------------------------
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

14
haproxy.spec
View File

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