commit: 464ae63af4f4e57f9379d5753e7105b14043dbae
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 09:24:51 2022 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 09:26:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464ae63a
net-proxy/haproxy: Fix ExcessiveLineLength
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
net-proxy/haproxy/haproxy-2.2.9999.ebuild | 6 ++++--
net-proxy/haproxy/haproxy-2.4.19.ebuild | 23 +++++++++++++++++------
net-proxy/haproxy/haproxy-2.4.9999.ebuild | 23 +++++++++++++++++------
net-proxy/haproxy/haproxy-2.5.10.ebuild | 23 +++++++++++++++++------
net-proxy/haproxy/haproxy-2.5.9.ebuild | 23 +++++++++++++++++------
net-proxy/haproxy/haproxy-2.5.9999.ebuild | 25 ++++++++++++++++++-------
net-proxy/haproxy/haproxy-2.6.6.ebuild | 23 +++++++++++++++++------
net-proxy/haproxy/haproxy-2.6.7.ebuild | 23 +++++++++++++++++------
net-proxy/haproxy/haproxy-2.6.9999.ebuild | 23 +++++++++++++++++------
net-proxy/haproxy/haproxy-2.7.0.ebuild | 23 +++++++++++++++++------
net-proxy/haproxy/haproxy-2.7.9999.ebuild | 23 +++++++++++++++++------
net-proxy/haproxy/haproxy-9999.ebuild | 23 +++++++++++++++++------
12 files changed, 192 insertions(+), 69 deletions(-)
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index c3fd5e9e2c2b..2bf20bf3ac64 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -108,14 +108,16 @@ 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}"
${args[@]}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}"
CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
emake -C contrib/systemd SBINDIR=/usr/sbin
if use tools ; then
for contrib in ${CONTRIBS[@]} ; do
# Those two includes are a workaround for hpack
Makefile missing those
emake -C contrib/${contrib} \
- 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[@]}
done
fi
}
diff --git a/net-proxy/haproxy/haproxy-2.4.19.ebuild
b/net-proxy/haproxy/haproxy-2.4.19.ebuild
index 4d418328ed38..ab90e472bdf0 100644
--- a/net-proxy/haproxy/haproxy-2.4.19.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.19.ebuild
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 4d418328ed38..ab90e472bdf0 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.5.10.ebuild
b/net-proxy/haproxy/haproxy-2.5.10.ebuild
index bc614b04caba..0ad63d10f264 100644
--- a/net-proxy/haproxy/haproxy-2.5.10.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.10.ebuild
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.5.9.ebuild
b/net-proxy/haproxy/haproxy-2.5.9.ebuild
index bc614b04caba..0ad63d10f264 100644
--- a/net-proxy/haproxy/haproxy-2.5.9.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.9.ebuild
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.5.9999.ebuild
b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
index bc614b04caba..5876aa5e5014 100644
--- a/net-proxy/haproxy/haproxy-2.5.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-3 lua5-3 )
[[ ${PV} == *9999 ]] && SCM="git-r3"
inherit toolchain-funcs lua-single systemd linux-info ${SCM}
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.6.6.ebuild
b/net-proxy/haproxy/haproxy-2.6.6.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-2.6.6.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.6.ebuild
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.6.7.ebuild
b/net-proxy/haproxy/haproxy-2.6.7.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-2.6.7.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.7.ebuild
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.6.9999.ebuild
b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-2.6.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.7.0.ebuild
b/net-proxy/haproxy/haproxy-2.7.0.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-2.7.0.ebuild
+++ b/net-proxy/haproxy/haproxy-2.7.0.ebuild
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.7.9999.ebuild
b/net-proxy/haproxy/haproxy-2.7.9999.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-2.7.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.7.9999.ebuild
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild
b/net-proxy/haproxy/haproxy-9999.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -97,19 +97,27 @@ 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} \
- 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
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin
admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range
haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
