diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-proxy/haproxy/haproxy-9999.ebuild | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'net-proxy/haproxy/haproxy-9999.ebuild')
| -rw-r--r-- | net-proxy/haproxy/haproxy-9999.ebuild | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild index 9b0bc07daa75..dbf2cbf0aea1 100644 --- a/net-proxy/haproxy/haproxy-9999.ebuild +++ b/net-proxy/haproxy/haproxy-9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -LUA_COMPAT=( lua5-3 ) +LUA_COMPAT=( lua5-4 lua5-3 ) [[ ${PV} == *9999 ]] && SCM="git-r3" inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} @@ -24,7 +24,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0/${PV}" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) @@ -53,6 +53,10 @@ S="${WORKDIR}/${MY_P}" DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack ) +PATCHES=( + "${FILESDIR}"/${PN}-lua54.patch +) + haproxy_use() { (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" @@ -97,15 +101,15 @@ src_compile() { fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin if use tools ; then for extra in ${EXTRAS[@]} ; do if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} else # Those two includes are a workaround for hpack Makefile missing those emake -C ${extra} \ @@ -133,7 +137,7 @@ src_install() { doins examples/errorfiles/* if use doc; then - dodoc ROADMAP doc/*.txt + dodoc doc/*.txt #if use lua; then # TODO: doc/lua-api/ #fi |