sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mariadb: attempt to fix https://github.com/termux/termux-packages/issues/4935 

Previous patch still not working for some devices...
This commit is contained in:
Leonid Pliushch 2020-02-19 15:19:29 +02:00
parent eda9a9693e
commit b0d00d5141
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/mariadb/build.sh
View File

@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
_VERSION=10.4.12 _VERSION=10.4.12
TERMUX_PKG_VERSION=2:${_VERSION} 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_SRCURL=http://ftp.hosteurope.de/mirror/archive.mariadb.org/mariadb-${_VERSION}/source/mariadb-${_VERSION}.tar.gz
TERMUX_PKG_SHA256=fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208 TERMUX_PKG_SHA256=fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208
TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob, zlib" TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob, zlib"

4
packages/mariadb/my_rdtsc.h.patch
View File

@ -5,7 +5,7 @@
# define __has_builtin(x) 0 /* Compatibility with non-clang compilers */ # define __has_builtin(x) 0 /* Compatibility with non-clang compilers */
# endif # endif
-# if __has_builtin(__builtin_readcyclecounter) -# if __has_builtin(__builtin_readcyclecounter)
+# if __has_builtin(__builtin_readcyclecounter) && !defined(__arm__) +# if __has_builtin(__builtin_readcyclecounter) && !defined(__ANDROID__)
# elif defined _WIN32 # elif defined _WIN32
# include <intrin.h> # include <intrin.h>
# elif defined __i386__ || defined __x86_64__ # elif defined __i386__ || defined __x86_64__
@ -14,7 +14,7 @@
static inline ulonglong my_timer_cycles(void) static inline ulonglong my_timer_cycles(void)
{ {
-# if __has_builtin(__builtin_readcyclecounter) -# if __has_builtin(__builtin_readcyclecounter)
+# if __has_builtin(__builtin_readcyclecounter) && !defined(__arm__) +# if __has_builtin(__builtin_readcyclecounter) && !defined(__ANDROID__)
return __builtin_readcyclecounter(); return __builtin_readcyclecounter();
# elif defined _WIN32 || defined __i386__ || defined __x86_64__ # elif defined _WIN32 || defined __i386__ || defined __x86_64__
return __rdtsc(); return __rdtsc();