From eaff7ac1d8cc0bd86e9c3f491473209f971c2e56 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 26 Dec 2014 12:18:36 -0600
Subject: update to latest upstream, fix uClibc-ng compile

---
 package/mysql/Makefile                           |  7 +++----
 package/mysql/patches/patch-cmake_os_Linux_cmake |  8 ++++----
 package/mysql/patches/patch-include_my_global_h  | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 package/mysql/patches/patch-include_my_global_h

(limited to 'package')

diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index e46dd8f0a..427dbe4db 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -4,8 +4,8 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
-PKG_VERSION:=		5.6.19
-PKG_RELEASE:=		2
+PKG_VERSION:=		5.6.22
+PKG_RELEASE:=		1
 PKG_MD5SUM:=		a663c5b3c710043c74f97902a1ed62c0
 PKG_DESCR:=		mysql client library
 PKG_SECTION:=		libs/db
@@ -34,8 +34,7 @@ CMAKE_FLAGS+=		-DSTACK_DIRECTION=1 \
 			-DCURSES_INCLUDE_PATH="$(STAGING_TARGET_DIR)/usr/include"
 
 host-configure:
-	cd ${WRKBUILD} && PATH='${HOST_PATH}' \
-		cmake .
+	cd ${WRKBUILD} && PATH='${HOST_PATH}' cmake .
 
 host-build:
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
diff --git a/package/mysql/patches/patch-cmake_os_Linux_cmake b/package/mysql/patches/patch-cmake_os_Linux_cmake
index be27d5517..69189db05 100644
--- a/package/mysql/patches/patch-cmake_os_Linux_cmake
+++ b/package/mysql/patches/patch-cmake_os_Linux_cmake
@@ -1,7 +1,7 @@
---- mysql-5.6.17.orig/cmake/os/Linux.cmake	2014-03-14 20:07:26.000000000 +0100
-+++ mysql-5.6.17/cmake/os/Linux.cmake	2014-04-04 10:11:45.000000000 +0200
-@@ -23,14 +23,6 @@ SET(TARGET_OS_LINUX 1)
- SET(HAVE_NPTL 1)
+--- mysql-5.6.22.orig/cmake/os/Linux.cmake	2014-11-20 23:39:51.000000000 -0600
++++ mysql-5.6.22/cmake/os/Linux.cmake	2014-12-26 10:30:24.216372609 -0600
+@@ -22,14 +22,6 @@ INCLUDE(CheckSymbolExists)
+ SET(TARGET_OS_LINUX 1)
  SET(_GNU_SOURCE 1)
  
 -# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
new file mode 100644
index 000000000..37c22fd7a
--- /dev/null
+++ b/package/mysql/patches/patch-include_my_global_h
@@ -0,0 +1,15 @@
+--- mysql-5.6.22.orig/include/my_global.h	2014-11-20 23:39:51.000000000 -0600
++++ mysql-5.6.22/include/my_global.h	2014-12-26 10:33:04.736371139 -0600
+@@ -769,11 +769,7 @@ inline unsigned long long my_double2ulon
+   #define my_isnan(X) std::isnan(X)
+   #define my_isinf(X) std::isinf(X)
+ #else
+-  #ifdef HAVE_LLVM_LIBCPP /* finite is deprecated in libc++ */
+-    #define my_isfinite(X) isfinite(X)
+-  #else
+-    #define my_isfinite(X) finite(X)
+-  #endif
++  #define my_isfinite(X) isfinite(X)
+   #define my_isnan(X) isnan(X)
+   #ifdef HAVE_ISINF
+     /* System-provided isinf() is available and safe to use */
-- 
cgit v1.2.3