On Tue, Dec 03, 2019 at 05:58:52PM -0800, [email protected] wrote:
> On 12/3/19 6:42 AM, Stuart Henderson wrote:
> > On 2019/12/03 00:03, [email protected] wrote:
> >> Hi Ports maintainers,
> >>
> >> Just to forward George's patch to fix libnettle build on mips64el in
> >> case it's buried in a misleading title.
> >
> > It's best to include the relevant maintainer if you're going to ask about
> > a port. Sometimes it makes sense to CC ports@ as well but definitely include
> > the maintainer.
> >
> > See "make show=MAINTAINER" or "pkg_info <pkgname>".
> >
>
> Thanks for the tip Stuart! I'm adding the maintainer Antoine and CCing
> George. The patch is reattached here.
Looks fine, ok.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/libnettle/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 29 Jun 2019 22:26:25 -0000 1.24
> +++ Makefile 30 Nov 2019 20:38:46 -0000
> @@ -4,6 +4,7 @@ COMMENT= cryptographic library
>
> DISTNAME= nettle-3.5.1
> PKGNAME= lib${DISTNAME}
> +REVISION= 0
>
> SHARED_LIBS += hogweed 3.0 # 6.5
> SHARED_LIBS += nettle 5.0 # 4.5
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/security/libnettle/patches/patch-configure,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-configure
> --- patches/patch-configure 29 Jun 2019 22:26:25 -0000 1.8
> +++ patches/patch-configure 30 Nov 2019 20:38:46 -0000
> @@ -1,5 +1,8 @@
> $OpenBSD: patch-configure,v 1.8 2019/06/29 22:26:25 ajacoutot Exp $
>
> +The test for __builtin_bswap64 must fail if the linker can't find the
> +symbol. We need this for base-gcc on little endian, like mips64el.
> +
> Fix relocation errors on (at least) sparc64.
>
> We don't want extra debug flags in regular builds.
> @@ -7,6 +10,15 @@ We don't want extra debug flags in regul
> Index: configure
> --- configure.orig
> +++ configure
> +@@ -6062,7 +6062,7 @@ uint64_t y = __builtin_bswap64(x);
> + return 0;
> + }
> + _ACEOF
> +-if ac_fn_c_try_compile "$LINENO"; then :
> ++if ac_fn_c_try_link "$LINENO"; then :
> + nettle_cv_c_builtin_bswap64=yes
> + else
> + nettle_cv_c_builtin_bswap64=no
> @@ -6720,6 +6720,7 @@ else
> bsdi4.*) CCPIC="-fPIC" ;;
> bsdi*) CCPIC="" ;;
--
Antoine
