Re: [PR PATCH] [Updated] mhash: make boolean usage musl C++ portable.

[yoshiyoshyosh <yoshiyoshyosh@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 885 bytes --]

There is an updated pull request by yoshiyoshyosh against master on the void-packages repository

https://github.com/yoshiyoshyosh/void-packages mhash
https://github.com/void-linux/void-packages/pull/46005

mhash: make boolean usage musl C++ portable.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc`)
- I built this PR locally for these architectures:
  - `x86_64-musl` (crossbuild)
  - `i686` (crossbuild)

mhash uses `_Bool` directly for `#define mhash_boolean _Bool`. [musl C++ doesn't define `_Bool`](https://www.openwall.com/lists/musl/2017/07/28/1), so any C++ projects that include it will fail to build on musl. This fixes that without impacting any C projects

A patch file from https://github.com/void-linux/void-packages/pull/46005.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mhash-46005.patch --]
[-- Type: text/x-diff, Size: 2033 bytes --]

From 1030401e3d54ed832f4c52bd26cf8c96f32a9b59 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Sun, 10 Sep 2023 12:28:33 -0400
Subject: [PATCH] mhash: make boolean usage musl C++ portable.

---
 srcpkgs/mhash/patches/fix-cpp-bools.patch | 21 +++++++++++++++++++++
 srcpkgs/mhash/template                    |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mhash/patches/fix-cpp-bools.patch

diff --git a/srcpkgs/mhash/patches/fix-cpp-bools.patch b/srcpkgs/mhash/patches/fix-cpp-bools.patch
new file mode 100644
index 0000000000000..418d25c7207e1
--- /dev/null
+++ b/srcpkgs/mhash/patches/fix-cpp-bools.patch
@@ -0,0 +1,21 @@
+--- a/include/mutils/mutils.h
++++ b/include/mutils/mutils.h
+@@ -21,6 +21,9 @@
+ #if !defined(__MUTILS_H)
+ #define __MUTILS_H
+ 
++#ifndef __cplusplus
++#include <stdbool.h>
++#endif
+ #include <mutils/mincludes.h>
+ 
+ #if defined(const)
+@@ -97,7 +100,7 @@ typedef unsigned char mutils_word8;
+  */
+ 
+ #if defined(HAVE__BOOL)
+-#define mutils_boolean _Bool
++#define mutils_boolean bool
+ #else
+ typedef char mutils_boolean;
+ #endif
diff --git a/srcpkgs/mhash/template b/srcpkgs/mhash/template
index 6f753713a513d..5a4c497927b24 100644
--- a/srcpkgs/mhash/template
+++ b/srcpkgs/mhash/template
@@ -1,8 +1,9 @@
 # Template file for 'mhash'
 pkgname=mhash
 version=0.9.9.9
-revision=1
+revision=2
 build_style=gnu-configure
+checkdepends="perl"
 short_desc="Uniform interface to a large number of hash algorithms"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-or-later"
@@ -10,6 +11,10 @@ homepage="http://mhash.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/project/mhash/mhash/${version}/mhash-${version}.tar.bz2"
 checksum=56521c52a9033779154432d0ae47ad7198914785265e1f570cee21ab248dfef0
 
+case "$XBPS_TARGET_ARCH" in
+	i686*|x86_64-musl) make_check=no ;; # tests fail without a hint as to why
+esac
+
 mhash-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"