From b0d00d51419f66420153b235411f2dfa98cf2649 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 19 Feb 2020 15:19:29 +0200 Subject: [PATCH] mariadb: attempt to fix https://github.com/termux/termux-packages/issues/4935 Previous patch still not working for some devices... --- packages/mariadb/build.sh | 1 + packages/mariadb/my_rdtsc.h.patch | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index c5adfd007..bcf708eae 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" _VERSION=10.4.12 TERMUX_PKG_VERSION=2:${_VERSION} +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://ftp.hosteurope.de/mirror/archive.mariadb.org/mariadb-${_VERSION}/source/mariadb-${_VERSION}.tar.gz TERMUX_PKG_SHA256=fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208 TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob, zlib" diff --git a/packages/mariadb/my_rdtsc.h.patch b/packages/mariadb/my_rdtsc.h.patch index 9161e4b75..031026d68 100644 --- a/packages/mariadb/my_rdtsc.h.patch +++ b/packages/mariadb/my_rdtsc.h.patch @@ -5,7 +5,7 @@ # define __has_builtin(x) 0 /* Compatibility with non-clang compilers */ # endif -# if __has_builtin(__builtin_readcyclecounter) -+# if __has_builtin(__builtin_readcyclecounter) && !defined(__arm__) ++# if __has_builtin(__builtin_readcyclecounter) && !defined(__ANDROID__) # elif defined _WIN32 # include # elif defined __i386__ || defined __x86_64__ @@ -14,7 +14,7 @@ static inline ulonglong my_timer_cycles(void) { -# if __has_builtin(__builtin_readcyclecounter) -+# if __has_builtin(__builtin_readcyclecounter) && !defined(__arm__) ++# if __has_builtin(__builtin_readcyclecounter) && !defined(__ANDROID__) return __builtin_readcyclecounter(); # elif defined _WIN32 || defined __i386__ || defined __x86_64__ return __rdtsc();