commit: e7e3e55282490d3323b4c7ce3396249245489d1f
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 8 09:08:51 2020 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Jul 8 09:09:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e3e552
net-proxy/haproxy: Bump to 2.0.15, 2.2.0 and 2.2.9999
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
net-proxy/haproxy/Manifest | 2 ++
.../haproxy/{haproxy-2.1.9999.ebuild => haproxy-2.0.15.ebuild} | 7 ++++++-
net-proxy/haproxy/haproxy-2.1.9999.ebuild | 7 ++++++-
.../haproxy/{haproxy-2.1.9999.ebuild => haproxy-2.2.0.ebuild} | 7 ++++++-
.../haproxy/{haproxy-2.1.9999.ebuild => haproxy-2.2.9999.ebuild} | 7 ++++++-
5 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 0071625a68e..93101944630 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,5 +1,7 @@
DIST haproxy-1.8.25.tar.gz 2184002 BLAKE2B
d6ea39af0109eee679d87dde258038bbb38ccf12796b2e6a7172067fce6bd0f10485e2a3d89ca5b3596529db4e34d511bbb194b019c7403703cb636573b0438d
SHA512
655eb4056989a3fee321ea9278a2085b0a999e522293f1f6229ebb8d17f3d33cb78abb4fd55a06d0218082e632b2d42de105575d0acd0c1b49996d4b45aa78e8
DIST haproxy-1.9.15.tar.gz 2480346 BLAKE2B
9ebdef0cb038324b1cbe74198e73fd7f3adf5d1c6ec4000fb02e2640fe79e4b64257bfb5d6da5f1ee73486969a47e13f386313d1923893d290ef368775a08d79
SHA512
618799c9c9c5ce2c9e42aaf22abe6018d1071a72ce54273c330538007d44568a29f643d53e4861d26dbc4fc5acd1b927361948dfc1c846574d6183b6ae81429c
DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B
dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0
SHA512
6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993
+DIST haproxy-2.0.15.tar.gz 2672167 BLAKE2B
19ffa210a95800e20f5aecbf0a2a99fb977003ba08de4604264ad5d51bcacf51f1898d7c782bfab08653aaf30b706e190fa1caabda1e1a8bd4638c69bae14308
SHA512
cf856b62f0d2e295ebca727e543eab0d91a8188c7ee6ec81f7d42b92b93678996ef05909cfd1d7aeab83208b6a2fc0a20c28a54d119fbbdf20451fc6a7343016
DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B
0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4
SHA512
fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98
DIST haproxy-2.1.7.tar.gz 2709999 BLAKE2B
74f6fb687d2e8d793773046e3a0919051b52eba0c4a91570ad3c6cf798b66daddaecf173c686d8474deb655d67524d7640753e1f5643cc4af4c339f3104d49bb
SHA512
d3338f128042f40e2969094a614eb840b1bf7409efa4f85aed7f45411af8532d2f2371436902e7b987b661580f9c21439fc027a65bb2d352cb86711a26545adb
+DIST haproxy-2.2.0.tar.gz 2866916 BLAKE2B
176234efefee72beb1b46e7e8bb2455edc4135323b834a73870e30ca7a439b24cbb62568cb2aacd9d6b4d5c2234ebe7524de119a3ac2ec1c1f701de03a174933
SHA512
25cff09acba29ba36f045d45f894d26a13eea3e71c3e1f868446e739eed1fcfee8fc4af8da2914eef7ecbfe266a498f931cc6ec6c3e73b8874c140618269f480
diff --git a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
b/net-proxy/haproxy/haproxy-2.0.15.ebuild
similarity index 96%
copy from net-proxy/haproxy/haproxy-2.1.9999.ebuild
copy to net-proxy/haproxy/haproxy-2.0.15.ebuild
index 7e2cb38725c..d1c45681b56 100644
--- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.15.ebuild
@@ -97,12 +97,17 @@ src_compile() {
# For now, until the strict-aliasing breakage will be fixed
append-cflags -fno-strict-aliasing
+ # Bug #668002
+ if use ppc || use arm || use hppa; then
+ TARGET_LDFLAGS=-latomic
+ fi
+
if use prometheus-exporter; then
EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
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}" ${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
diff --git a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
b/net-proxy/haproxy/haproxy-2.1.9999.ebuild
index 7e2cb38725c..d1c45681b56 100644
--- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.9999.ebuild
@@ -97,12 +97,17 @@ src_compile() {
# For now, until the strict-aliasing breakage will be fixed
append-cflags -fno-strict-aliasing
+ # Bug #668002
+ if use ppc || use arm || use hppa; then
+ TARGET_LDFLAGS=-latomic
+ fi
+
if use prometheus-exporter; then
EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
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}" ${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
diff --git a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
b/net-proxy/haproxy/haproxy-2.2.0.ebuild
similarity index 96%
copy from net-proxy/haproxy/haproxy-2.1.9999.ebuild
copy to net-proxy/haproxy/haproxy-2.2.0.ebuild
index 7e2cb38725c..d1c45681b56 100644
--- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.0.ebuild
@@ -97,12 +97,17 @@ src_compile() {
# For now, until the strict-aliasing breakage will be fixed
append-cflags -fno-strict-aliasing
+ # Bug #668002
+ if use ppc || use arm || use hppa; then
+ TARGET_LDFLAGS=-latomic
+ fi
+
if use prometheus-exporter; then
EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
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}" ${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
diff --git a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
similarity index 96%
copy from net-proxy/haproxy/haproxy-2.1.9999.ebuild
copy to net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 7e2cb38725c..d1c45681b56 100644
--- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -97,12 +97,17 @@ src_compile() {
# For now, until the strict-aliasing breakage will be fixed
append-cflags -fno-strict-aliasing
+ # Bug #668002
+ if use ppc || use arm || use hppa; then
+ TARGET_LDFLAGS=-latomic
+ fi
+
if use prometheus-exporter; then
EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
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}" ${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
