Fix mariadb build and bump libpsl on CI
This commit is contained in:
parent
3fedf3ba45
commit
dcb317183e
@ -8,6 +8,7 @@ TERMUX_PKG_DEPENDS="libidn2, libunistring"
|
||||
TERMUX_PKG_BREAKS="libpsl-dev"
|
||||
TERMUX_PKG_REPLACES="libpsl-dev"
|
||||
|
||||
#bump
|
||||
termux_step_pre_configure() {
|
||||
autoreconf -fiv
|
||||
}
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -u -r ../mariadb-10.4.12/cmake/build_configurations/mysql_release.cmake ./cmake/build_configurations/mysql_release.cmake
|
||||
--- ../mariadb-10.4.12/cmake/build_configurations/mysql_release.cmake 2020-01-26 20:43:49.000000000 +0000
|
||||
+++ ./cmake/build_configurations/mysql_release.cmake 2020-02-15 23:22:03.546831000 +0000
|
||||
@@ -124,7 +124,7 @@
|
||||
|
||||
IF(UNIX)
|
||||
SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
|
||||
- SET(PLUGIN_AUTH_PAM YES)
|
||||
+ SET(PLUGIN_AUTH_PAM NO)
|
||||
|
||||
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
IF(NOT IGNORE_AIO_CHECK)
|
@ -1,20 +0,0 @@
|
||||
--- include/my_rdtsc.h.orig 2020-02-17 00:55:47.642830626 +0000
|
||||
+++ ./include/my_rdtsc.h 2020-02-17 00:56:16.083322798 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
# ifndef __has_builtin
|
||||
# define __has_builtin(x) 0 /* Compatibility with non-clang compilers */
|
||||
# endif
|
||||
-# if __has_builtin(__builtin_readcyclecounter)
|
||||
+# if __has_builtin(__builtin_readcyclecounter) && !defined(__ANDROID__)
|
||||
# elif defined _WIN32
|
||||
# include <intrin.h>
|
||||
# elif defined __i386__ || defined __x86_64__
|
||||
@@ -125,7 +125,7 @@
|
||||
*/
|
||||
static inline ulonglong my_timer_cycles(void)
|
||||
{
|
||||
-# if __has_builtin(__builtin_readcyclecounter)
|
||||
+# if __has_builtin(__builtin_readcyclecounter) && !defined(__ANDROID__)
|
||||
return __builtin_readcyclecounter();
|
||||
# elif defined _WIN32 || defined __i386__ || defined __x86_64__
|
||||
return __rdtsc();
|
Loading…
Reference in New Issue
Block a user