diff options
Diffstat (limited to 'net-proxy/haproxy/haproxy-2.4.14.ebuild')
| -rw-r--r-- | net-proxy/haproxy/haproxy-2.4.14.ebuild | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/net-proxy/haproxy/haproxy-2.4.14.ebuild b/net-proxy/haproxy/haproxy-2.4.14.ebuild index 997cdfc5d4d0..931074ca6e03 100644 --- a/net-proxy/haproxy/haproxy-2.4.14.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.14.ebuild @@ -16,19 +16,18 @@ if [[ ${PV} != *9999 ]]; then SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" else - EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master fi LICENSE="GPL-2 LGPL-2.1" SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter -ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl" +ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ${LUA_REQUIRED_USE} ) - device-atlas? ( pcre ) ?? ( slz zlib )" BDEPEND="virtual/pkgconfig" @@ -47,8 +46,7 @@ DEPEND=" ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) - lua? ( ${LUA_DEPS} ) - device-atlas? ( dev-libs/device-atlas-api-c )" + lua? ( ${LUA_DEPS} )" RDEPEND="${DEPEND} acct-group/haproxy acct-user/haproxy" @@ -91,7 +89,6 @@ src_compile() { args+=( $(haproxy_use zlib ZLIB) ) args+=( $(haproxy_use lua LUA) ) args+=( $(haproxy_use 51degrees 51DEGREES) ) - args+=( $(haproxy_use device-atlas DEVICEATLAS) ) args+=( $(haproxy_use wurfl WURFL) ) args+=( $(haproxy_use systemd SYSTEMD) ) args+=( $(haproxy_use prometheus-exporter PROMEX) ) @@ -102,19 +99,19 @@ 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=${ERROT}/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=${ERROT}/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=${ERROT}/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=${ERROT}/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} \ - CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} + CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} fi done fi |