CVS commit: pkgsrc/misc/rhash

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Jun 27 01:19:40 UTC 2022

Modified Files:
        pkgsrc/misc/rhash: distinfo
        pkgsrc/misc/rhash/patches: patch-configure

Log Message:
rhash: properly reapply build fix for OSes without aligned_alloc

This was previously fixed by schmonz@, but was half lost in the update
to 1.4.3. Upstream added their own macro NO_POSIX_ALIGNED_ALLOC to help
deal with this, so a patch was dropped, but our patch to the configure
script wasn't adjusted to match that new macro definition.

Should fix PR pkg/55571 and PR pkg/56902.

Note I have no environment with which to test this, but it seems obvious
from code inspection, and adjusting the patch did not influence test
builds on NetBSD 9.2_STABLE, Fedora 36, or OmniOS r151038.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/misc/rhash/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/rhash/patches/patch-configure

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

Modified files:

Index: pkgsrc/misc/rhash/distinfo
diff -u pkgsrc/misc/rhash/distinfo:1.21 pkgsrc/misc/rhash/distinfo:1.22
--- pkgsrc/misc/rhash/distinfo:1.21     Wed Jun 15 08:54:58 2022
+++ pkgsrc/misc/rhash/distinfo  Mon Jun 27 01:19:39 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2022/06/15 08:54:58 adam Exp $
+$NetBSD: distinfo,v 1.22 2022/06/27 01:19:39 gutteridge Exp $
 
 BLAKE2s (rhash-1.4.3.tar.gz) = fd47c6f7997416d295fa92fa0611dc956596ff91f1199049baf3b6bd2d88a427
 SHA512 (rhash-1.4.3.tar.gz) = d87ffcde28d8f25cf775c279fed457e52d24523ed9b695629dae694b3c22372247d18f6032f8ce13a0b70fa2953be408982e46659daaa7c4ab227ae89eaed9c7
 Size (rhash-1.4.3.tar.gz) = 429290 bytes
-SHA1 (patch-configure) = 6f0c4abf3f487f046feea5aca5866481eda4546a
+SHA1 (patch-configure) = aba3e782bd317504fcb35a4d59b4146ccb944171
 SHA1 (patch-librhash_Makefile) = f5a3ccdd8c0467b11f2dda553310bf5a9c8ade0c

Index: pkgsrc/misc/rhash/patches/patch-configure
diff -u pkgsrc/misc/rhash/patches/patch-configure:1.2 pkgsrc/misc/rhash/patches/patch-configure:1.3
--- pkgsrc/misc/rhash/patches/patch-configure:1.2       Thu Jul 15 09:39:17 2021
+++ pkgsrc/misc/rhash/patches/patch-configure   Mon Jun 27 01:19:40 2022
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.2 2021/07/15 09:39:17 adam Exp $
+$NetBSD: patch-configure,v 1.3 2022/06/27 01:19:40 gutteridge Exp $
 
 Skip compiler detection magic.
 
 Avoid choosing aligned_alloc() when it's not present, such as CentOS 6
-with lang/gcc7.
+with lang/gcc7 and older Solaris releases.
 
 --- configure.orig     2021-07-14 20:55:34.000000000 +0000
 +++ configure
@@ -26,7 +26,7 @@ with lang/gcc7.
 +  HAS_STDC_ALIGNED_ALLOC=yes
 +fi
 +if test "$HAS_STDC_ALIGNED_ALLOC" = "no"; then
-+  BUILD_EXTRA_CFLAGS=$(join_params $BUILD_EXTRA_CFLAGS -DNOPE_DOES_NOT_HAS_STDC_ALIGNED_ALLOC)
++  BUILD_EXTRA_CFLAGS=$(join_params $BUILD_EXTRA_CFLAGS -DNO_STDC_ALIGNED_ALLOC)
 +fi
 +finish_check "$HAS_STDC_ALIGNED_ALLOC"
 +