On Wed, Mar 13 2019, Daniel Jakots <d...@chown.me> wrote:
> On Sat, 9 Mar 2019 17:55:43 +0100, Charlene Wendling
> <juliana...@posteo.jp> wrote:
>
>> This requires atomics at least on macppc, where it has been built
>> sucessfully [1], and probably hppa.
>
> Wasn't this solved on hppa with
> commit 0eb74ae52d1a40be580169c2333dafaaacdb3aac
> Author: jca <j...@openbsd.org>
> Date: Tue Sep 8 18:28:50 2015 +0000
>
> Disable the shared SSL session cache on hppa, and remove the BROKEN
> marker.
>
> hppa lacks the atomic ops needed for this feature. Other archs may be
> good candidates too.
>
> ok Daniel Jakots (maintainer), juanfra@
>
> diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
> index 83b94a7b999..2436c1829f7 100644
> --- a/net/haproxy/Makefile
> +++ b/net/haproxy/Makefile
> @@ -1,6 +1,4 @@
> -# $OpenBSD: Makefile,v 1.21 2015/09/07 22:20:52 juanfra Exp $
> -
> -BROKEN-hppa = undefined reference to __sync atomic ops
> +# $OpenBSD: Makefile,v 1.22 2015/09/08 18:28:50 jca Exp $
>
> COMMENT = reliable, high performance TCP/HTTP load balancer
>
> @@ -28,6 +26,10 @@ MAKE_FLAGS += CFLAGS="${CFLAGS}
> -fno-strict-aliasing" LDFLAGS="${LDFLAGS}"
> MAKE_FLAGS += CC="${CC}" LD="${CC}" TARGET="openbsd"
> MAKE_FLAGS += USE_OPENSSL=1 USE_PCRE=1
>
> +.if ${MACHINE_ARCH:Mhppa}
> +MAKE_FLAGS += USE_PRIVATE_CACHE=1
> +.endif
> +
> NO_TEST = Yes
> LIB_DEPENDS = devel/pcre
>
Yep, but then I removed the workaround because it wasn't needed any more
on powerpc after the switch to ports-gcc, and I assumed that hppa would
behave similarly. But there have been several haproxy updates since.
> Anyway, as long as you don't break amd64 and you don't make a mess of
> the Makefile, no objection from me :)
Regarding the diff:
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/haproxy/Makefile,v
> retrieving revision 1.55
> diff -u -p -u -p -r1.55 Makefile
> --- Makefile 14 Jan 2019 18:18:59 -0000 1.55
> +++ Makefile 9 Mar 2019 16:18:58 -0000
> @@ -38,6 +38,12 @@ EXAMPLES = acl-content-sw content-sw-sam
> DOCSDIR = ${PREFIX}/share/doc/haproxy
> EXAMPLESDIR = ${PREFIX}/share/examples/haproxy
>
> +# Fix undefined reference to __atomic_*
> +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "hppa"
> +LDFLAGS += "-latomic"
> +WANTLIB += atomic
I don't remember if I have already shared this concern, but this will
fail as soon as powerpc switches to "base-clang". A quick search tells
me that at least devel/protobuf, games/stockfish and net/bro could be
similarly affected.
ok jca@ but we'll (hopefully) have to revisit this in the future.
> +.endif
> +
>
> pre-install:
> ${SUBST_CMD} ${WRKSRC}/doc/haproxy.1
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
signature.asc
Description: PGP signature
