diff --git a/app-crypt/rhash/patches/rhash-1.4.2.patchset b/app-crypt/rhash/patches/rhash-1.4.2.patchset deleted file mode 100644 index 95e8e07de..000000000 --- a/app-crypt/rhash/patches/rhash-1.4.2.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 2db8b9e337e073f52c762f12373632044fefe340 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sat, 31 Oct 2020 12:41:12 +0100 -Subject: Haiku have no alligned_alloc - - -diff --git a/librhash/util.h b/librhash/util.h -index 6accc7b..0a4db35 100644 ---- a/librhash/util.h -+++ b/librhash/util.h -@@ -39,7 +39,7 @@ extern "C" { - # define rhash_aligned_alloc(alignment, size) _aligned_malloc((size), (alignment)) - # define rhash_aligned_free(ptr) _aligned_free(ptr) - --#elif (__STDC_VERSION__ >= 201112L || defined(_ISOC11_SOURCE)) && !defined(__APPLE__) -+#elif (__STDC_VERSION__ >= 201112L || defined(_ISOC11_SOURCE)) && !defined(__APPLE__) && !defined(__HAIKU__) - - # define HAS_STDC_ALIGNED_ALLOC - # include --- -2.28.0 - diff --git a/app-crypt/rhash/patches/rhash-1.4.4.patchset b/app-crypt/rhash/patches/rhash-1.4.4.patchset new file mode 100644 index 000000000..b32bd96df --- /dev/null +++ b/app-crypt/rhash/patches/rhash-1.4.4.patchset @@ -0,0 +1,39 @@ +From 183d6f4d38564039f3fcef33957df6e05b07889b Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 9 Feb 2024 13:34:00 +0100 +Subject: Haiku patch + + +diff --git a/configure b/configure +index dae76d5..3eb5bac 100755 +--- a/configure ++++ b/configure +@@ -514,6 +514,7 @@ else + linux|uclinux) TARGET_OS=Linux ;; + freebsd*) TARGET_OS=FreeBSD ;; + gnu/kfreebsd) TARGET_OS=FreeBSD ;; ++ haiku) TARGET_OS=Haiku ;; + netbsd) TARGET_OS=NetBSD ;; + bsd/os) TARGET_OS=BSD/OS ;; + openbsd) TARGET_OS=OpenBSD ;; +@@ -553,6 +554,7 @@ darwin() { test "$OS_LC" = "darwin"; } + dragonfly() { test "$OS_LC" = "dragonfly"; } + freebsd() { test "$OS_LC" = "freebsd" || test "$OS_LC" = "gnu/kfreebsd"; } + gnu() { test "$OS_LC" = "gnu"; } ++haiku() { test "$OS_LC" = "haiku"; } + hpux() { test "$OS_LC" = "hp-ux"; } + irix() { test "$OS_LC" = "irix"; } + linux() { test "$OS_LC" = "linux"; } +@@ -716,6 +718,9 @@ elif darwin; then + elif linux; then + # use the full library version for the library file extension + SHARED_EXT=".so.${RHASH_VERSION}" ++elif haiku; then ++ # use the full library version for the library file extension ++ SHARED_EXT=".so.${RHASH_VERSION}" + fi + + ##################################################################### +-- +2.42.1 + diff --git a/app-crypt/rhash/rhash-1.4.2.recipe b/app-crypt/rhash/rhash-1.4.4.recipe similarity index 95% rename from app-crypt/rhash/rhash-1.4.2.recipe rename to app-crypt/rhash/rhash-1.4.4.recipe index ca7fff991..4cece4107 100644 --- a/app-crypt/rhash/rhash-1.4.2.recipe +++ b/app-crypt/rhash/rhash-1.4.4.recipe @@ -11,7 +11,7 @@ COPYRIGHT="2005-2020 Aleksey Kravchenko" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/rhash/RHash/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="600d00f5f91ef04194d50903d3c79412099328c42f28ff43a0bdb777b00bec62" +CHECKSUM_SHA256="8e7d1a8ccac0143c8fe9b68ebac67d485df119ea17a613f4038cda52f84ef52a" SOURCE_DIR="RHash-$portVersion" PATCHES="rhash-$portVersion.patchset" @@ -103,8 +103,7 @@ BUILD() INSTALL() { make install install-pkg-config - make -C librhash install-lib-headers - make -C librhash install-so-link + make -C librhash install-lib-headers install-lib-shared install-so-link prepareInstalledDevelLib librhash fixPkgconfig