gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-02 23:48:17 -07:00
Code Issues Projects Releases Wiki Activity

net-proxy/haproxy: Introduce USE=slz

Browse Source 
USE=zlib stay the default one in order to avoid users to have to
manually satisfy USE flag constraints since USE=zlib and USE=slz are
mutually exclusive.

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2293

Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
This commit is contained in:
Bertrand Jacquin
2016-09-18 00:51:56 +01:00
committed by Christian Ruppert
parent dc60838940
commit 4a0bcfa4da
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net-proxy/haproxy/haproxy-1.6.9.ebuild
View File

@@ -15,8 +15,9 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="+crypt doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
REQUIRED_USE="pcre-jit? ( pcre )"
IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
pcre? (
@@ -27,6 +28,7 @@ DEPEND="
!libressl? ( dev-libs/openssl:0=[zlib?] )
libressl? ( dev-libs/libressl:0= )
)
slz? ( dev-libs/libslz:= )
zlib? ( sys-libs/zlib )"
# lua? ( dev-lang/lua:5.3 )
RDEPEND="${DEPEND}"
@@ -79,6 +81,7 @@ src_compile() {
# args+=( $(haproxy_use kernel_linux LINUX_TPROXY) )
args+=( $(haproxy_use ssl OPENSSL) )
args+=( $(haproxy_use slz SLZ) )
args+=( $(haproxy_use zlib ZLIB) )
# For now, until the strict-aliasing breakage will be fixed

7
net-proxy/haproxy/haproxy-9999.ebuild
View File

@@ -15,8 +15,9 @@ EGIT_REPO_URI="http://master.formilux.org/git/people/willy/haproxy.git"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS=""
IUSE="+crypt doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
REQUIRED_USE="pcre-jit? ( pcre )"
IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
pcre? (
@@ -27,6 +28,7 @@ DEPEND="
!libressl? ( dev-libs/openssl:0=[zlib?] )
libressl? ( dev-libs/libressl:0= )
)
slz? ( dev-libs/libslz:= )
zlib? ( sys-libs/zlib )"
# lua? ( dev-lang/lua:5.3 )
RDEPEND="${DEPEND}"
@@ -79,6 +81,7 @@ src_compile() {
# args+=( $(haproxy_use kernel_linux LINUX_TPROXY) )
args+=( $(haproxy_use ssl OPENSSL) )
args+=( $(haproxy_use slz SLZ) )
args+=( $(haproxy_use zlib ZLIB) )
# For now, until the strict-aliasing breakage will be fixed

1
net-proxy/haproxy/metadata.xml
View File

@@ -21,6 +21,7 @@ Its event-driven architecture allows it to easily handle thousands of simultaneo
<use>
<flag name="net_ns">Enable network namespace support (CONFIG_NET_NS)</flag>
<flag name="pcre-jit">Use JIT support for PCRE</flag>
<flag name="slz">Use <pkg>dev-libs/libslz</pkg> compression library</flag>
<flag name="tools">Install additional tools (halog, iprange)</flag>
</use>
</pkgmetadata>