diff --git a/SPECS/haproxy-1.8.12.el6.spec b/SPECS/haproxy-1.8.12.el6.spec index 2c8c0c0..2bada8e 100644 --- a/SPECS/haproxy-1.8.12.el6.spec +++ b/SPECS/haproxy-1.8.12.el6.spec @@ -44,7 +44,7 @@ risking the system's stability. %define __perl_requires /bin/true %build -%{__make} USE_PCRE=1 TARGET=linux2628 USE_LINUX_TPROXY=1 USE_ZLIB=1 USE_OPENSSL=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include DEBUG="" ARCH=%{_target_cpu} +%{__make} USE_PCRE=1 TARGET=linux2628 USE_ZLIB=1 USE_OPENSSL=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include DEBUG="" ARCH=%{_target_cpu} %install [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} diff --git a/SPECS/haproxy-1.8.12.el7.spec b/SPECS/haproxy-1.8.12.el7.spec index 8a15e03..00c538c 100644 --- a/SPECS/haproxy-1.8.12.el7.spec +++ b/SPECS/haproxy-1.8.12.el7.spec @@ -60,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 pushd contrib/systemd %{__make} diff --git a/SPECS/haproxy-1.8.20.el6.spec b/SPECS/haproxy-1.8.20.el6.spec index bea39ae..055ab72 100644 --- a/SPECS/haproxy-1.8.20.el6.spec +++ b/SPECS/haproxy-1.8.20.el6.spec @@ -44,7 +44,7 @@ risking the system's stability. %define __perl_requires /bin/true %build -%{__make} USE_PCRE=1 TARGET=linux2628 USE_LINUX_TPROXY=1 USE_ZLIB=1 USE_OPENSSL=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include DEBUG="" ARCH=%{_target_cpu} +%{__make} USE_PCRE=1 TARGET=linux2628 USE_ZLIB=1 USE_OPENSSL=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include DEBUG="" ARCH=%{_target_cpu} %install [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} diff --git a/SPECS/haproxy-1.9.8.el6.spec b/SPECS/haproxy-1.9.8.el6.spec index 7c62460..efec0c5 100644 --- a/SPECS/haproxy-1.9.8.el6.spec +++ b/SPECS/haproxy-1.9.8.el6.spec @@ -60,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 pushd contrib/systemd %{__make} diff --git a/SPECS/haproxy-1.9.8.el7.spec b/SPECS/haproxy-1.9.8.el7.spec index 7c62460..efec0c5 100644 --- a/SPECS/haproxy-1.9.8.el7.spec +++ b/SPECS/haproxy-1.9.8.el7.spec @@ -60,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 pushd contrib/systemd %{__make} diff --git a/SPECS/haproxy-1.9.9.el7.spec b/SPECS/haproxy-1.9.9.el7.spec index 95f50d0..3c3894b 100644 --- a/SPECS/haproxy-1.9.9.el7.spec +++ b/SPECS/haproxy-1.9.9.el7.spec @@ -60,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 pushd contrib/systemd %{__make} diff --git a/SPECS/haproxy-2.0.0.el7.spec b/SPECS/haproxy-2.0.0.el7.spec index d8b1ecb..ab7a9c3 100644 --- a/SPECS/haproxy-2.0.0.el7.spec +++ b/SPECS/haproxy-2.0.0.el7.spec @@ -60,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 pushd contrib/systemd %{__make} diff --git a/SPECS/haproxy-2.0.1.el7.spec b/SPECS/haproxy-2.0.1.el7.spec index b80023d..eb7a056 100644 --- a/SPECS/haproxy-2.0.1.el7.spec +++ b/SPECS/haproxy-2.0.1.el7.spec @@ -60,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 pushd contrib/systemd %{__make} diff --git a/SPECS/haproxy-2.0.2.el7.spec b/SPECS/haproxy-2.0.2.el7.spec index 4ea20c6..905b29e 100644 --- a/SPECS/haproxy-2.0.2.el7.spec +++ b/SPECS/haproxy-2.0.2.el7.spec @@ -60,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 pushd contrib/systemd %{__make} diff --git a/SPECS/haproxy-2.0.3.el7.spec b/SPECS/haproxy-2.0.3.el7.spec index a7182d7..b41d05c 100644 --- a/SPECS/haproxy-2.0.3.el7.spec +++ b/SPECS/haproxy-2.0.3.el7.spec @@ -60,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 pushd contrib/systemd %{__make} diff --git a/SPECS/haproxy-2.0.4.el7.spec b/SPECS/haproxy-2.0.4.el7.spec index c502759..4ccd162 100644 --- a/SPECS/haproxy-2.0.4.el7.spec +++ b/SPECS/haproxy-2.0.4.el7.spec @@ -60,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 pushd contrib/systemd %{__make} diff --git a/SPECS/haproxy-2.0.5.el7.spec b/SPECS/haproxy-2.0.5.el7.spec index d79c016..f6296a9 100644 --- a/SPECS/haproxy-2.0.5.el7.spec +++ b/SPECS/haproxy-2.0.5.el7.spec @@ -60,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_SYSTEMD=1 USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 LUA_LIB=/usr/local/lib LUA_INC=/usr/local/include ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" DEFINE=-DTCP_USER_TIMEOUT=18 pushd contrib/systemd %{__make}