| 1 |
commit: 510215752be59ccf102d6ec51bf54d23de27d476 |
| 2 |
Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info> |
| 3 |
AuthorDate: Fri May 8 03:01:18 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 23 19:19:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51021575 |
| 7 |
|
| 8 |
net-proxy/haproxy: Fix 32-bit build |
| 9 |
|
| 10 |
Links against libatomic on 32-bit non-x86 arches. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/668002 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/15704 |
| 14 |
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info> |
| 15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 16 |
|
| 17 |
net-proxy/haproxy/haproxy-2.0.14-r1.ebuild | 7 ++++++- |
| 18 |
net-proxy/haproxy/haproxy-2.1.4-r1.ebuild | 7 ++++++- |
| 19 |
2 files changed, 12 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild |
| 22 |
index 7e2cb38725c..d1c45681b56 100644 |
| 23 |
--- a/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild |
| 24 |
+++ b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild |
| 25 |
@@ -97,12 +97,17 @@ src_compile() { |
| 26 |
# For now, until the strict-aliasing breakage will be fixed |
| 27 |
append-cflags -fno-strict-aliasing |
| 28 |
|
| 29 |
+ # Bug #668002 |
| 30 |
+ if use ppc || use arm || use hppa; then |
| 31 |
+ TARGET_LDFLAGS=-latomic |
| 32 |
+ fi |
| 33 |
+ |
| 34 |
if use prometheus-exporter; then |
| 35 |
EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
| 36 |
fi |
| 37 |
|
| 38 |
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
| 39 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]} |
| 40 |
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} |
| 41 |
emake -C contrib/systemd SBINDIR=/usr/sbin |
| 42 |
|
| 43 |
if use tools ; then |
| 44 |
|
| 45 |
diff --git a/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild |
| 46 |
index 7e2cb38725c..d1c45681b56 100644 |
| 47 |
--- a/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild |
| 48 |
+++ b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild |
| 49 |
@@ -97,12 +97,17 @@ src_compile() { |
| 50 |
# For now, until the strict-aliasing breakage will be fixed |
| 51 |
append-cflags -fno-strict-aliasing |
| 52 |
|
| 53 |
+ # Bug #668002 |
| 54 |
+ if use ppc || use arm || use hppa; then |
| 55 |
+ TARGET_LDFLAGS=-latomic |
| 56 |
+ fi |
| 57 |
+ |
| 58 |
if use prometheus-exporter; then |
| 59 |
EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" |
| 60 |
fi |
| 61 |
|
| 62 |
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing |
| 63 |
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]} |
| 64 |
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} |
| 65 |
emake -C contrib/systemd SBINDIR=/usr/sbin |
| 66 |
|
| 67 |
if use tools ; then |
Archives