Re: Patch from George to fix libnettle build on mips64el (was Fwd: "undefined reference to `__builtin_bswap64'" on mips64el/loongson)

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEiKQfd6o81mjI+LWALell7WOCXJMFAl3n5p8ACgkQLell7WOC
XJM86A//SAIKG9L+pVVyv1MWV+f9V5S4HyxPZ8Wec3l+Oluk0Py09ipdGQNMRkJj
5qJqTdJVZ1XP2FzlUsb7i4/pOUHdQwElrTj9pgm1XAgSrL8emr3c3EJSlM7Y36lz
r7WMrs7EVkqRNI9djzl2EO3YZQoQgVCRRjVUX3AYW6tLD1GkLhik9eIax0tzi5lA
xa475JxBUA6gyH4oC4mKDAbWg7ZO8R5h58+wBU9tFzYJAuS7eSrj6tR+KabLbXOg
1f43N9VR7YzL5cp7txk7jem3hKhAzqy2CjIQtR72NoaWhGmXCPJiSDxDNgcPFAp/
zy1AxVEeGfFVv/K2Q79p+QMKDVXDIPBfeDImyGpF15yjgvPHxd9pYZW022DjIhy/
qEKoc9FesWRCncF38j5tmHqFRb2jpInTsC/NZztYE5z7JkFpXo/uCTQ62utp8b6j
c0te07JwsEnRxpCZsFCRmOpfFXZQoLfTjYdrNioGyN9NHHweyMdrQoK0rL+qdFcy
rlkNqUcacfkNW4ts+hYEBgMPrBu7UYEhv1iouflYeTF/jNUnnDGaO8TvicnogXNW
lzSFhat47WDEqTGcKGQcPRtIqhHvXGW34Sb0muuqmH434OyeTSl9ucEbpLDDfKV0
6U/qfRNe+F1DNBQdDDcFUvXAflftU5whVyIM451ioqXELQbE5wo=
=VpMN
-----END PGP SIGNATURE-----
On 12/3/19 10:28 PM, Antoine Jacoutot wrote:
> On Tue, Dec 03, 2019 at 05:58:52PM -0800, manphiz@gmail.com wrote:
>> On 12/3/19 6:42 AM, Stuart Henderson wrote:
>>> On 2019/12/03 00:03, manphiz@gmail.com 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.
>

Thanks Antoine! Can you also help commit it (I don't have permission)?

>> 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="" ;;
>
>
>
>
>