diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 6b8c2c5db0..9ab2342b5c 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -82,7 +82,7 @@ # build with UPnP support (yes / no) KODI_UPNP_SUPPORT="yes" -# build with MySQL support (mysql / mariadb / none) +# build with MySQL support (mariadb / none) KODI_MYSQL_SUPPORT="mariadb" # build xbmc with optical drive support (yes / no) diff --git a/packages/databases/mysql/package.mk b/packages/databases/mysql/package.mk deleted file mode 100644 index ee014f9535..0000000000 --- a/packages/databases/mysql/package.mk +++ /dev/null @@ -1,86 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="mysql" -PKG_VERSION="5.7.20" -PKG_SHA256="5397549bb7c238f396c123db2df4cad2191b11adf8986de7fe63bff8e2786487" -PKG_LICENSE="LGPL" -PKG_SITE="http://www.mysql.com" -PKG_URL="http://ftp.gwdg.de/pub/misc/$PKG_NAME/Downloads/MySQL-5.7/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="toolchain:host zlib:host" -PKG_DEPENDS_TARGET="toolchain zlib ncurses openssl boost mysql:host" -PKG_LONGDESC="A SQL database server." - -PKG_CMAKE_OPTS_HOST="-DCMAKE_BUILD_TYPE=Release \ - -DSTACK_DIRECTION=-1 \ - -DHAVE_LLVM_LIBCPP_EXITCODE=0 \ - -DHAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE_EXITCODE=0 \ - -DWITHOUT_SERVER=OFF \ - -DWITH_EMBEDDED_SERVER=OFF \ - -DWITH_INNOBASE_STORAGE_ENGINE=OFF \ - -DWITH_PARTITION_STORAGE_ENGINE=OFF \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF \ - -DWITH_EXTRA_CHARSETS=none \ - -DWITH_EDITLINE=bundled \ - -DWITH_LIBEVENT=bundled \ - -DDOWNLOAD_BOOST=0 \ - -DLOCAL_BOOST_DIR=$(get_build_dir boost) \ - -DWITH_UNIT_TESTS=OFF \ - -DWITH_ZLIB=bundled" - -PKG_CMAKE_OPTS_TARGET="-DINSTALL_INCLUDEDIR=include/mysql \ - -DCMAKE_BUILD_TYPE=Release \ - -DFEATURE_SET=classic \ - -DDISABLE_SHARED=ON \ - -DENABLE_DTRACE=OFF \ - -DWITH_EMBEDDED_SERVER=OFF \ - -DWITH_INNOBASE_STORAGE_ENGINE=OFF \ - -DWITH_PARTITION_STORAGE_ENGINE=OFF \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF \ - -DWITH_EXTRA_CHARSETS=all \ - -DWITH_UNIT_TESTS=OFF \ - -DWITHOUT_SERVER=ON \ - -DWITH_EDITLINE=bundled \ - -DWITH_LIBEVENT=bundled \ - -DWITH_ZLIB=system \ - -DWITH_SSL=$SYSROOT_PREFIX/usr \ - -DDOWNLOAD_BOOST=0 \ - -DLOCAL_BOOST_DIR=$(get_build_dir boost) \ - -DSTACK_DIRECTION=1 \ - -DHAVE_LLVM_LIBCPP=1" - -post_unpack() { - sed -i 's|GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)|SET(LIBMYSQL_OS_OUTPUT_NAME "mysqlclient")|' $PKG_BUILD/scripts/CMakeLists.txt - sed -i "s|COMMAND comp_err|COMMAND $TOOLCHAIN/bin/comp_err|" $PKG_BUILD/extra/CMakeLists.txt - sed -i "s|COMMAND comp_sql|COMMAND $TOOLCHAIN/bin/comp_sql|" $PKG_BUILD/scripts/CMakeLists.txt - sed -i "s|COMMAND gen_lex_hash|COMMAND $TOOLCHAIN/bin/gen_lex_hash|" $PKG_BUILD/sql/CMakeLists.txt - - sed -i '/^IF(NOT BOOST_MINOR_VERSION.*$/,/^ENDIF()$/d' $PKG_BUILD/cmake/boost.cmake -} - -make_host() { - ninja comp_err - ninja gen_lex_hash - ninja comp_sql -} - -post_make_host() { - # needed so the binary isn't built for target - cp scripts/comp_sql ../scripts/comp_sql -} - -makeinstall_host() { - cp -P extra/comp_err $TOOLCHAIN/bin - cp -P sql/gen_lex_hash $TOOLCHAIN/bin - cp -P scripts/comp_sql $TOOLCHAIN/bin -} - -post_makeinstall_target() { - sed -i "s|pkgincludedir=.*|pkgincludedir=\'$SYSROOT_PREFIX/usr/include/mysql\'|" scripts/mysql_config - sed -i "s|pkglibdir=.*|pkglibdir=\'$SYSROOT_PREFIX/usr/lib/mysql\'|" scripts/mysql_config - cp scripts/mysql_config $SYSROOT_PREFIX/usr/bin - cp scripts/mysql_config $TOOLCHAIN/bin/mysql_config - - rm -rf $INSTALL -} diff --git a/packages/databases/mysql/patches/mysql-0002-revert-floating-point-optimizations.patch b/packages/databases/mysql/patches/mysql-0002-revert-floating-point-optimizations.patch deleted file mode 100644 index 4c5aef58e6..0000000000 --- a/packages/databases/mysql/patches/mysql-0002-revert-floating-point-optimizations.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake ---- a/cmake/build_configurations/compiler_options.cmake 2016-12-19 09:18:07.169866414 +0000 -+++ b/cmake/build_configurations/compiler_options.cmake 2016-12-19 09:19:26.290338156 +0000 -@@ -15,8 +15,6 @@ - - INCLUDE(CheckCCompilerFlag) - INCLUDE(CheckCXXCompilerFlag) --INCLUDE(cmake/compiler_bugs.cmake) --INCLUDE(cmake/floating_point.cmake) - - IF(SIZEOF_VOIDP EQUAL 4) - SET(32BIT 1) -@@ -35,10 +33,6 @@ - IF(WITH_VALGRIND) - SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") - ENDIF() -- # Disable expensive-optimization if shift-or-optimization bug effective -- IF(HAVE_C_SHIFT_OR_OPTIMIZATION_BUG) -- SET(C_NO_EXPENSIVE_OPTIMIZATIONS TRUE) -- ENDIF() - # Disable floating point expression contractions to avoid result differences - IF(HAVE_C_FLOATING_POINT_FUSED_MADD) - IF(HAVE_C_FP_CONTRACT_FLAG) -@@ -69,14 +63,6 @@ - IF(HAVE_CXX_SHIFT_OR_OPTIMIZATION_BUG) - SET(CXX_NO_EXPENSIVE_OPTIMIZATIONS TRUE) - ENDIF() -- # Disable floating point expression contractions to avoid result differences -- IF(HAVE_CXX_FLOATING_POINT_FUSED_MADD) -- IF(HAVE_CXX_FP_CONTRACT_FLAG) -- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -ffp-contract=off") -- ELSE() -- SET(CXX_NO_EXPENSIVE_OPTIMIZATIONS TRUE) -- ENDIF() -- ENDIF() - IF(CXX_NO_EXPENSIVE_OPTIMIZATIONS) - SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -fno-expensive-optimizations") - ENDIF() diff --git a/packages/databases/mysql/patches/mysql-0003-compile-comp_err-even-when-crosscompiling.patch b/packages/databases/mysql/patches/mysql-0003-compile-comp_err-even-when-crosscompiling.patch deleted file mode 100644 index 350f3b813e..0000000000 --- a/packages/databases/mysql/patches/mysql-0003-compile-comp_err-even-when-crosscompiling.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur a/extra/CMakeLists.txt b/extra/CMakeLists.txt ---- a/extra/CMakeLists.txt 2016-09-21 23:16:59.458308368 -0700 -+++ b/extra/CMakeLists.txt 2016-09-21 23:17:34.187663318 -0700 -@@ -28,11 +28,9 @@ - # Default install component for the files is Server here - SET(MYSQL_INSTALL_COMPONENT Server) - --IF(NOT CMAKE_CROSSCOMPILING) -- ADD_EXECUTABLE(comp_err comp_err.c) -- TARGET_LINK_LIBRARIES(comp_err mysys mysys_ssl) -- SET_TARGET_PROPERTIES(comp_err PROPERTIES LINKER_LANGUAGE CXX) --ENDIF() -+ADD_EXECUTABLE(comp_err comp_err.c) -+TARGET_LINK_LIBRARIES(comp_err mysys mysys_ssl) -+SET_TARGET_PROPERTIES(comp_err PROPERTIES LINKER_LANGUAGE CXX) - - IF (BUILD_BUNDLED_LZ4) - ADD_CONVENIENCE_LIBRARY(lz4_lib diff --git a/packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch b/packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch deleted file mode 100644 index e42f7b8f02..0000000000 --- a/packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 1d0480b..425abb8 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -14,10 +14,8 @@ - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - # Build comp_sql - used for embedding SQL in C or C++ programs --IF(NOT CMAKE_CROSSCOMPILING) -- ADD_EXECUTABLE(comp_sql comp_sql.c) -- TARGET_LINK_LIBRARIES(comp_sql) --ENDIF() -+ADD_EXECUTABLE(comp_sql comp_sql.c) -+TARGET_LINK_LIBRARIES(comp_sql) - - # Add compiler information, for easier debugging of output from mysql_config. - SET(COMPILER_ID_AND_VERSION diff --git a/packages/databases/mysql/patches/mysql-0005-pchar-fix-in-client-authtentification.patch b/packages/databases/mysql/patches/mysql-0005-pchar-fix-in-client-authtentification.patch deleted file mode 100644 index bbde74e716..0000000000 --- a/packages/databases/mysql/patches/mysql-0005-pchar-fix-in-client-authtentification.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sql-common/client_authentication.cc 2017-05-06 16:38:34.349486565 +0200 -+++ b/sql-common/client_authentication.cc 2017-05-06 16:41:32.286431336 +0200 -@@ -84,7 +84,7 @@ - - if (mysql->options.extension != NULL && - mysql->options.extension->server_public_key_path != NULL && -- mysql->options.extension->server_public_key_path != '\0') -+ *(mysql->options.extension->server_public_key_path) != '\0') - { - pub_key_file= fopen(mysql->options.extension->server_public_key_path, - "r");