pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnunet: Import patch from Debian to prevent build failure on big endian. Comment status of patch-configure.



Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Mon Apr 11 17:03:27 2022 +0200
Changeset:	474789c1b3e3efcd0cd63797a74c1b5463cbc67e

Modified Files:
	gnunet/distinfo
	gnunet/patches/patch-configure
Added Files:
	gnunet/patches/patch-src_include_gnunet_common.h

Log Message:
gnunet: Import patch from Debian to prevent build failure on big endian.
Comment status of patch-configure.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=474789c1b3e3efcd0cd63797a74c1b5463cbc67e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnunet/distinfo                                  |  3 ++-
 gnunet/patches/patch-configure                   |  2 +-
 gnunet/patches/patch-src_include_gnunet_common.h | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diffs:
diff --git a/gnunet/distinfo b/gnunet/distinfo
index c1b20671f7..6955aa6682 100644
--- a/gnunet/distinfo
+++ b/gnunet/distinfo
@@ -3,5 +3,6 @@ $NetBSD$
 BLAKE2s (gnunet-0.16.3.tar.gz) = 693612916e9c777bffe64533cb54a0011279ccaedfbbf84c66bd6148bc29bdcb
 SHA512 (gnunet-0.16.3.tar.gz) = fad8fcdb4b8058f17aef13a6176d8f19ab88d77fc5fcc709a4bbda463b2217ed2342f3e858c634114b9e4cf8651082af19ca1d490b1dce5e4302c421e1f88664
 Size (gnunet-0.16.3.tar.gz) = 9392002 bytes
-SHA1 (patch-configure) = 98e52ee2ee281ec54392aef307c67091c0b94dbe
+SHA1 (patch-configure) = c33f33f45a8bff553c3828282526c32f670cf97d
+SHA1 (patch-src_include_gnunet_common.h) = 44a0f31cd3d7fa4df5491cf9cf2efa31e695cdb9
 SHA1 (patch-src_setu_gnunet-service-setu.c) = 2e6c8eb895544fe79e27edec85e37379ec9b3783
diff --git a/gnunet/patches/patch-configure b/gnunet/patches/patch-configure
index ff56f70678..37dbc89229 100644
--- a/gnunet/patches/patch-configure
+++ b/gnunet/patches/patch-configure
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Fix mysql version detection.
+Fix mysql version detection. Fixed in next release.
 
 --- configure.orig	2022-04-08 12:31:53.471282883 +0200
 +++ configure	2022-04-08 12:33:13.084608511 +0200
diff --git a/gnunet/patches/patch-src_include_gnunet_common.h b/gnunet/patches/patch-src_include_gnunet_common.h
new file mode 100644
index 0000000000..20da3499a4
--- /dev/null
+++ b/gnunet/patches/patch-src_include_gnunet_common.h
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Patch adopted from Debian.
+Defining BYTE_SWAP_* on big endian systems to fix FTBFS.
+Authored by Gianfranco Costamagna <locutusofborg%debian.org@localhost>.
+
+--- src/include/gnunet_common.h.orig
++++ src/include/gnunet_common.h
+@@ -178,6 +178,15 @@ enum GNUNET_GenericReturnValue
+ #define GNUNET_le64toh(x) (x)
+ #endif
+ #if __BYTE_ORDER == __BIG_ENDIAN
++#ifdef HAVE_BYTESWAP_H
++#define BYTE_SWAP_16(x) bswap_16 (x)
++#define BYTE_SWAP_32(x) bswap_32 (x)
++#define BYTE_SWAP_64(x) bswap_64 (x)
++#else
++#define BYTE_SWAP_16(x) __bswap_16 (x)
++#define BYTE_SWAP_32(x) __bswap_32 (x)
++#define BYTE_SWAP_64(x) __bswap_64 (x)
++#endif
+ #define GNUNET_htobe16(x) (x)
+ #define GNUNET_htole16(x) BYTE_SWAP_16 (x)
+ #define GNUNET_be16toh(x) (x)


Home | Main Index | Thread Index | Old Index