redis: Backport alignment fix

This commit is contained in:
Tee KOBAYASHI 2023-05-03 02:48:08 +09:00 committed by xtkoba
parent 15cb8e5dca
commit 608abb3e16
2 changed files with 20 additions and 5 deletions

View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="In-memory data structure store used as a database, cache
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=7.0.11
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://download.redis.io/releases/redis-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=ce250d1fba042c613de38a15d40889b78f7cb6d5461a27e35017ba39b07221e3
TERMUX_PKG_DEPENDS="libandroid-execinfo, libandroid-glob"
@ -16,11 +17,6 @@ termux_step_pre_configure() {
CPPFLAGS+=" -DHAVE_BACKTRACE"
CFLAGS+=" $CPPFLAGS"
LDFLAGS+=" -landroid-execinfo -landroid-glob"
# https://github.com/termux/termux-packages/issues/15849
if [ "$TERMUX_ARCH" = "arm" ]; then
CFLAGS="${CFLAGS/-mfpu=neon/} -mfpu=vfpv3"
fi
}
termux_step_post_make_install() {

View File

@ -0,0 +1,19 @@
https://github.com/termux/termux-packages/issues/15849
Partial backport of https://github.com/redis/redis/commit/f3f6f7c0d66f136146a912e06c8fbe31ecfbc977
Please always test on arm (32-bit) arch if you modify or delete this patch.
--- a/src/zmalloc.c
+++ b/src/zmalloc.c
@@ -60,8 +60,9 @@
#ifdef HAVE_MALLOC_SIZE
#define PREFIX_SIZE (0)
#else
-#if defined(__sun) || defined(__sparc) || defined(__sparc__)
-#define PREFIX_SIZE (sizeof(long long))
+/* Use at least 8 bytes alignment on all systems. */
+#if SIZE_MAX < 0xffffffffffffffffull
+#define PREFIX_SIZE 8
#else
#define PREFIX_SIZE (sizeof(size_t))
#endif