diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2022-06-27 01:19:39 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2022-06-27 01:19:39 +0000 |
| commit | 2f82f42604ae9e48ee8534fa308e3c089091d7c1 (patch) | |
| tree | 32b00bc84412003a32b79a07b09e9b051b03a6a7 | |
| parent | 8ae9906685d883e45edb9cac5eccdf5d72b8ea49 (diff) | |
| download | pkgsrc-2f82f42604ae9e48ee8534fa308e3c089091d7c1.tar.gz | |
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.
| -rw-r--r-- | misc/rhash/distinfo | 4 | ||||
| -rw-r--r-- | misc/rhash/patches/patch-configure | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/misc/rhash/distinfo b/misc/rhash/distinfo index 5e97746c973..663b5618450 100644 --- a/misc/rhash/distinfo +++ b/misc/rhash/distinfo @@ -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 diff --git a/misc/rhash/patches/patch-configure b/misc/rhash/patches/patch-configure index 89e19aa04be..d4ef9c14045 100644 --- a/misc/rhash/patches/patch-configure +++ b/misc/rhash/patches/patch-configure @@ -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" + |