CVS commit: pkgsrc/textproc/cityhash

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Apr 22 10:21:53 UTC 2024

Modified Files:
        pkgsrc/textproc/cityhash: distinfo
        pkgsrc/textproc/cityhash/patches: patch-src_city.cc

Log Message:
textproc/cityhash: Fix NetBSD implementation.

Don't probe for implementation-specific symbols, there's no need.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/cityhash/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/cityhash/patches/patch-src_city.cc

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

Modified files:

Index: pkgsrc/textproc/cityhash/distinfo
diff -u pkgsrc/textproc/cityhash/distinfo:1.6 pkgsrc/textproc/cityhash/distinfo:1.7
--- pkgsrc/textproc/cityhash/distinfo:1.6       Tue Oct 26 11:21:47 2021
+++ pkgsrc/textproc/cityhash/distinfo   Mon Apr 22 10:21:52 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:21:47 nia Exp $
+$NetBSD: distinfo,v 1.7 2024/04/22 10:21:52 he Exp $
 
 BLAKE2s (cityhash-1.1.1.tar.gz) = 41e650077d3b87abf8e02efac7dfa6e1e833b4ec004c4f50cd07a0f06a0596a4
 SHA512 (cityhash-1.1.1.tar.gz) = f5476a608fad87770aa6622f3c9ac441db1a0b1731e5235bf8599499943184a1fe5b91329cb9153b363a3e34605f7641b233114440e8895791df7d13452bb4f6
 Size (cityhash-1.1.1.tar.gz) = 376456 bytes
-SHA1 (patch-src_city.cc) = 1620e169d4bbabfcc5fb68ec471b6aeac4ae09cc
+SHA1 (patch-src_city.cc) = 2c4cc6824b10e984f33fd3d3aa875885a36d96c5

Index: pkgsrc/textproc/cityhash/patches/patch-src_city.cc
diff -u pkgsrc/textproc/cityhash/patches/patch-src_city.cc:1.2 pkgsrc/textproc/cityhash/patches/patch-src_city.cc:1.3
--- pkgsrc/textproc/cityhash/patches/patch-src_city.cc:1.2      Sun Jan 19 02:54:56 2014
+++ pkgsrc/textproc/cityhash/patches/patch-src_city.cc  Mon Apr 22 10:21:53 2024
@@ -1,13 +1,20 @@
-$NetBSD: patch-src_city.cc,v 1.2 2014/01/19 02:54:56 rodent Exp $
+$NetBSD: patch-src_city.cc,v 1.3 2024/04/22 10:21:53 he Exp $
 
 Add support for SunOS.
+Fix support for NetBSD, submitted as
+  https://github.com/google/cityhash/pull/40
 
 --- src/city.cc.orig   2013-06-17 19:45:57.000000000 +0000
 +++ src/city.cc
-@@ -69,6 +69,16 @@ static uint32 UNALIGNED_LOAD32(const cha
- #define bswap_64(x) bswap64(x)
- #endif
+@@ -64,10 +64,18 @@ static uint32 UNALIGNED_LOAD32(const cha
  
+ #include <sys/types.h>
+ #include <machine/bswap.h>
+-#if defined(__BSWAP_RENAME) && !defined(__bswap_32)
+ #define bswap_32(x) bswap32(x)
+ #define bswap_64(x) bswap64(x)
+-#endif
++
 +#elif defined(__sun)
 +#include <sys/byteorder.h>
 +#define bswap_32(x) htonl(x)
@@ -17,7 +24,6 @@ Add support for SunOS.
 +#include <sys/endian.h>
 +#define bswap_32(x) bswap32(x)
 +#define bswap_64(x) bswap64(x)
-+
+ 
  #else
  
- #include <byteswap.h>