summaryrefslogtreecommitdiff
path: root/package/mysql/patches/patch-cmake_os_Linux_cmake
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/patches/patch-cmake_os_Linux_cmake
parent92d7f6522617c947d635680d045f12a4ef77bcb4 (diff)
parentaada563860a7b07e89f6ea40e7ce9e811ad6c25d (diff)
merge conflict, update hash
Diffstat (limited to 'package/mysql/patches/patch-cmake_os_Linux_cmake')
-rw-r--r--package/mysql/patches/patch-cmake_os_Linux_cmake8
1 files changed, 4 insertions, 4 deletions
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.