pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/protobuf protobuf: fix build on NetBSD



details:   https://anonhg.NetBSD.org/pkgsrc/rev/85e92be6688b
branches:  trunk
changeset: 452740:85e92be6688b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri May 14 19:36:47 2021 +0000

description:
protobuf: fix build on NetBSD

diffstat:

 devel/protobuf/distinfo                                       |   3 +-
 devel/protobuf/patches/patch-src_google_protobuf_stubs_port.h |  29 +++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)

diffs (48 lines):

diff -r 843f07089844 -r 85e92be6688b devel/protobuf/distinfo
--- a/devel/protobuf/distinfo   Fri May 14 18:58:37 2021 +0000
+++ b/devel/protobuf/distinfo   Fri May 14 19:36:47 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2021/05/13 12:16:54 adam Exp $
+$NetBSD: distinfo,v 1.51 2021/05/14 19:36:47 wiz Exp $
 
 SHA1 (protobuf-cpp-3.17.0.tar.gz) = aa0c0e46f06adbb199f45fcb69a115b7344ada79
 RMD160 (protobuf-cpp-3.17.0.tar.gz) = 691ee68e6a5e59bd5e4b9b7361d481c38ae7c691
@@ -6,4 +6,5 @@
 Size (protobuf-cpp-3.17.0.tar.gz) = 4688814 bytes
 SHA1 (patch-configure) = 22a1fc4e701b348772b3e2e4c68aad3b97032cc5
 SHA1 (patch-src_google_protobuf_port__def.inc) = c65c327878691dcd7d3c7be496c51ca4ff8ae776
+SHA1 (patch-src_google_protobuf_stubs_port.h) = cc09f2d6507ef11adb158226b33a282063e0b453
 SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1
diff -r 843f07089844 -r 85e92be6688b devel/protobuf/patches/patch-src_google_protobuf_stubs_port.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/protobuf/patches/patch-src_google_protobuf_stubs_port.h     Fri May 14 19:36:47 2021 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_google_protobuf_stubs_port.h,v 1.1 2021/05/14 19:36:47 wiz Exp $
+
+Fix parentheses.
+
+--- src/google/protobuf/stubs/port.h.orig      2021-05-12 23:23:56.000000000 +0000
++++ src/google/protobuf/stubs/port.h
+@@ -263,14 +263,14 @@ static inline uint32 bswap_32(uint32 x) 
+ 
+ #ifndef bswap_64
+ static inline uint64 bswap_64(uint64 x) {
+-  return (((x & uint64_t{0xFFu)) << 56) |
+-          ((x & uint64_t{0xFF00u)) << 40) |
+-          ((x & uint64_t{0xFF0000u)) << 24) |
+-          ((x & uint64_t{0xFF000000u)) << 8) |
+-          ((x & uint64_t{0xFF00000000u)) >> 8) |
+-          ((x & uint64_t{0xFF0000000000u)) >> 24) |
+-          ((x & uint64_t{0xFF000000000000u)) >> 40) |
+-          ((x & uint64_t{0xFF00000000000000u)) >> 56));
++  return (((x & uint64_t{0xFFu}) << 56) |
++          ((x & uint64_t{0xFF00u}) << 40) |
++          ((x & uint64_t{0xFF0000u}) << 24) |
++          ((x & uint64_t{0xFF000000u}) << 8) |
++          ((x & uint64_t{0xFF00000000u}) >> 8) |
++          ((x & uint64_t{0xFF0000000000u}) >> 24) |
++          ((x & uint64_t{0xFF000000000000u}) >> 40) |
++          ((x & uint64_t{0xFF00000000000000u}) >> 56));
+ }
+ #define bswap_64(x) bswap_64(x)
+ #endif



Home | Main Index | Thread Index | Old Index