[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

["Christian Ruppert" <idl0r@gentoo.org>]

commit:     741a46fb49803626396ba873976e38911311b959
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 20 16:59:08 2021 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 16:59:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741a46fb

net-proxy/haproxy: Version bumps

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>

 net-proxy/haproxy/Manifest                                       | 2 ++
 .../haproxy/{haproxy-2.0.9999.ebuild => haproxy-2.0.23.ebuild}   | 9 +++++++--
 net-proxy/haproxy/haproxy-2.0.9999.ebuild                        | 9 +++++++--
 .../haproxy/{haproxy-2.0.9999.ebuild => haproxy-2.2.15.ebuild}   | 9 +++++++--
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index c05e43ee1b9..a37f218ce37 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,7 +1,9 @@
 DIST haproxy-1.8.30.tar.gz 2214184 BLAKE2B 07378b61c0b103fe3ff4c4ab936960d2f709cd20833ce2c343dece5496997f6819c68d0a58c6e11e4020b9a551328f9522b0ab739e7a0acd549eaa883bff7401 SHA512 13b0f80ad08c8d3ae41114b8112acd4f80f1f173f1a91a5f65439be86f341653be43ce9fe69168a934ccdb7a24abf476aef097b1f8fec5a0577f72ef19486d1f
 DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993
 DIST haproxy-2.0.22.tar.gz 2698262 BLAKE2B 417bc6bdfad276d210d597896f0685637034593a2418b0fcf984e62b767a491000a1f62f58b5ccc8f552890de14607737bc81bdf4736b6e4212ac15081ef5689 SHA512 29a1ee6d77892003ab4d813336d1ea165d91784bcf2124b98ca030e376e7ccc1c1b9f09e9a85ef0cd04f9808b589bfc7b7c19f831dcb55bb41d7777a172112ff
+DIST haproxy-2.0.23.tar.gz 2704381 BLAKE2B dbdad6bb11470088cae0092b4f0cef38840e2166f31e1fe2d571515ebd12c234a1470e7e59c07a68ab95f664deb15a1df537f405ffc800d89b0261fe5cb644f0 SHA512 0ede44b4d33630ac2d4419c93333aeb95c3cdc24f2aa0438a7e7fe57b4063fd91e308f974f29efdbfe62f24bc051c742645b48f3a810befc315ea54f1ada37dc
 DIST haproxy-2.2.14.tar.gz 2923727 BLAKE2B 6a234490247b5b0d8bf9131683deaa7b7fd4468aceaeec9c4ff401315a6be6237b5eae25a74330ffc2438de54f0e91938e8830fa8f17d6366286f6880be4af34 SHA512 ec5e2bf0c38a9af878f69f062e81e096b849c3ae93957bbcddc32f7c0e972d678136c8f06a16e594b60b7e2f41228e8179e93b4b0a3478ab775bece6745db877
+DIST haproxy-2.2.15.tar.gz 2930086 BLAKE2B 2198b7a6bc90f94fe511f3307df3323cc5ded3b722721992d54df5f41fc0d9f007494251f56d6365d781bcc97af81b98d2dd553ab2f11029b57a5a57d395cb5a SHA512 ef77cb2201ea61e7ac085acca8db6e9ee43ce1db2e8c5366d49cad9ace654eb81809a70f96b20a6f6f549061f8a73012ad1805a009c3e1c6fa5cd195af795012
 DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca
 DIST haproxy-2.3.10.tar.gz 2942240 BLAKE2B 1fecbf3dde98b4839911e3e6437fa01ebf2e8b5b534665619703d42c9163afcd2b19768d408b27484ad73061e10b54b4bb512f09444944c403a30431814e8f8a SHA512 595a62d677240cb8a463245e5d5d497bb584a379852e533d82e45a77e1b91b469f84e386adcd42b6ec24e5806e256fc2708f672a0da5c1c4f784e3b76a9e7318
 DIST haproxy-2.3.12.tar.gz 2950703 BLAKE2B cd3aedaf82bc914d7d62d894187941f64f130b3a9019d5aeba08214f85acd928b7760ce9b5062ffcbc79f8378fa221b6d44b374dac924c33afd5bcc4c3b212ed SHA512 6f5dffaf80d88882848ca6df1fdd68fae17cbf039e311b54f622faa68c36007b827f4f2e71bc1260dd7a395bdc70637a9bac7ea7be414f1971172aaf5f474386

diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.23.ebuild
similarity index 96%
copy from net-proxy/haproxy/haproxy-2.0.9999.ebuild
copy to net-proxy/haproxy/haproxy-2.0.23.ebuild
index 41c1558bb74..6335de9e475 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.23.ebuild
@@ -45,8 +45,8 @@ DEPEND="
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
 	)
-	systemd? ( sys-apps/systemd )
 	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
@@ -103,12 +103,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.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index 41c1558bb74..6335de9e475 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -45,8 +45,8 @@ DEPEND="
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
 	)
-	systemd? ( sys-apps/systemd )
 	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
@@ -103,12 +103,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.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.15.ebuild
similarity index 96%
copy from net-proxy/haproxy/haproxy-2.0.9999.ebuild
copy to net-proxy/haproxy/haproxy-2.2.15.ebuild
index 41c1558bb74..6335de9e475 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.15.ebuild
@@ -45,8 +45,8 @@ DEPEND="
 	ssl? (
 		dev-libs/openssl:0=[zlib?]
 	)
-	systemd? ( sys-apps/systemd )
 	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
@@ -103,12 +103,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