summaryrefslogtreecommitdiff
path: root/package/mysql
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2014-12-27 06:55:59 (GMT)
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2014-12-27 06:55:59 (GMT)
commitd18bf49e2a7d39e4ae340787ccdd2246550956d2 (patch)
tree783a0fa109e532fba6c9bc2dedcbeaad9116ca77 /package/mysql
parent92d7f6522617c947d635680d045f12a4ef77bcb4 (diff)
parentaada563860a7b07e89f6ea40e7ce9e811ad6c25d (diff)
merge conflict, update hash
Diffstat (limited to 'package/mysql')
-rw-r--r--package/mysql/Makefile9
-rw-r--r--package/mysql/patches/patch-cmake_os_Linux_cmake8
-rw-r--r--package/mysql/patches/patch-include_my_global_h15
3 files changed, 23 insertions, 9 deletions
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 3bea7ab..1f56a91 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= mysql
-PKG_VERSION:= 5.6.19
-PKG_RELEASE:= 2
-PKG_HASH:= 80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f
+PKG_VERSION:= 5.6.22
+PKG_RELEASE:= 1
+PKG_HASH:= c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6
PKG_DESCR:= mysql client library
PKG_SECTION:= libs/db
PKG_DEPENDS:= libncurses zlib libevent
@@ -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 be27d55..69189db 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 0000000..37c22fd
--- /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 */