From dcb317183e38d9a1bb565083597221cf6a39e42a Mon Sep 17 00:00:00 2001
From: Butta <repo@butta.fastem.com>
Date: Sat, 15 Aug 2020 20:48:32 +0530
Subject: [PATCH] Fix mariadb build and bump libpsl on CI

---
 packages/libpsl/build.sh                      |  1 +
 ...d_configurations-mysql_release.cmake.patch | 12 -----------
 packages/mariadb/my_rdtsc.h.patch             | 20 -------------------
 3 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 packages/mariadb/cmake-build_configurations-mysql_release.cmake.patch
 delete mode 100644 packages/mariadb/my_rdtsc.h.patch

diff --git a/packages/libpsl/build.sh b/packages/libpsl/build.sh
index a869a1a69..0b6ec7dab 100644
--- a/packages/libpsl/build.sh
+++ b/packages/libpsl/build.sh
@@ -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
 }
diff --git a/packages/mariadb/cmake-build_configurations-mysql_release.cmake.patch b/packages/mariadb/cmake-build_configurations-mysql_release.cmake.patch
deleted file mode 100644
index 103996a09..000000000
--- a/packages/mariadb/cmake-build_configurations-mysql_release.cmake.patch
+++ /dev/null
@@ -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)
diff --git a/packages/mariadb/my_rdtsc.h.patch b/packages/mariadb/my_rdtsc.h.patch
deleted file mode 100644
index 031026d68..000000000
--- a/packages/mariadb/my_rdtsc.h.patch
+++ /dev/null
@@ -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();