summaryrefslogtreecommitdiff
path: root/package/mysql/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-04-02 14:12:12 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2017-04-02 14:12:47 (GMT)
commit8a08b5fb4bab4499946893a11e0f54a7ac326613 (patch)
treed5ee02a168bc18a6ba59380401804e63efba1df8 /package/mysql/patches
parentde028c53782d602e33ede44d41e20d750963b0b4 (diff)
remove mysql and fbsplash
Diffstat (limited to 'package/mysql/patches')
-rw-r--r--package/mysql/patches/patch-cmake_os_Linux_cmake17
-rw-r--r--package/mysql/patches/patch-cmd-line-utils_libedit_chartype_h22
-rw-r--r--package/mysql/patches/patch-include_my_global_h15
-rw-r--r--package/mysql/patches/patch-scripts_mysql_config_sh20
4 files changed, 0 insertions, 74 deletions
diff --git a/package/mysql/patches/patch-cmake_os_Linux_cmake b/package/mysql/patches/patch-cmake_os_Linux_cmake
deleted file mode 100644
index 69189db..0000000
--- a/package/mysql/patches/patch-cmake_os_Linux_cmake
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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.
--FOREACH(LANG C CXX)
-- STRING(REPLACE "-rdynamic" ""
-- CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS
-- ${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}
-- )
--ENDFOREACH()
--
- # Ensure we have clean build for shared libraries
- # without unresolved symbols
- # Not supported with AddressSanitizer
diff --git a/package/mysql/patches/patch-cmd-line-utils_libedit_chartype_h b/package/mysql/patches/patch-cmd-line-utils_libedit_chartype_h
deleted file mode 100644
index 73ece99..0000000
--- a/package/mysql/patches/patch-cmd-line-utils_libedit_chartype_h
+++ /dev/null
@@ -1,22 +0,0 @@
---- mysql-5.6.17.orig/cmd-line-utils/libedit/chartype.h 2014-03-14 20:07:26.000000000 +0100
-+++ mysql-5.6.17/cmd-line-utils/libedit/chartype.h 2014-04-05 06:38:33.000000000 +0200
-@@ -45,19 +45,6 @@
- * seems to actually advertise this properly, despite Unicode 3.1 having
- * been around since 2001... */
-
--/* XXXMYSQL : Added FreeBSD & AIX to bypass this check.
-- TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
--#if !defined(__NetBSD__) && !defined(__sun) \
-- && !(defined(__APPLE__) && defined(__MACH__)) \
-- && !defined(__FreeBSD__) && !defined(_AIX)
--#ifndef __STDC_ISO_10646__
--/* In many places it is assumed that the first 127 code points are ASCII
-- * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
-- * funky encoding that could break us in weird and wonderful ways. */
-- #error wchar_t must store ISO 10646 characters
--#endif
--#endif
--
- /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
- * ref: ISO/IEC DTR 19769
- */
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
deleted file mode 100644
index 37c22fd..0000000
--- a/package/mysql/patches/patch-include_my_global_h
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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 */
diff --git a/package/mysql/patches/patch-scripts_mysql_config_sh b/package/mysql/patches/patch-scripts_mysql_config_sh
deleted file mode 100644
index 87ba2a8..0000000
--- a/package/mysql/patches/patch-scripts_mysql_config_sh
+++ /dev/null
@@ -1,20 +0,0 @@
---- mysql-5.6.17.orig/scripts/mysql_config.sh 2014-03-14 20:07:28.000000000 +0100
-+++ mysql-5.6.17/scripts/mysql_config.sh 2014-04-29 21:45:14.000000000 +0200
-@@ -83,7 +83,7 @@ execdir='@libexecdir@'
- bindir='@bindir@'
-
- # If installed, search for the compiled in directory first (might be "lib64")
--pkglibdir='@pkglibdir@'
-+pkglibdir='@@STAGING_DIR@@@pkglibdir@'
- pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
- fix_path pkglibdir $pkglibdir_rel lib/mysql lib
-
-@@ -91,7 +91,7 @@ plugindir='@pkgplugindir@'
- plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
- fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
-
--pkgincludedir='@pkgincludedir@'
-+pkgincludedir='@@STAGING_DIR@@@pkgincludedir@'
- if [ -f "$basedir/include/mysql/mysql.h" ]; then
- pkgincludedir="$basedir/include/mysql"
- elif [ -f "$basedir/include/mysql.h" ]; then