jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

mysql: update to mysql-5.7.17

Browse Source
This commit is contained in:
MilhouseVH 2016-12-21 13:19:06 +00:00
parent 32a850c454
commit fca86f7259
2 changed files with 25 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/databases/mysql/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="mysql" PKG_NAME="mysql"
PKG_VERSION="5.7.15" PKG_VERSION="5.7.17"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="LGPL" PKG_LICENSE="LGPL"

103
packages/databases/mysql/patches/mysql-0002-revert-floating-point-optimizations.patch
View File

@ -1,93 +1,38 @@
diff -Naur a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake diff -Naur a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake
--- a/cmake/build_configurations/compiler_options.cmake 2016-07-12 04:55:26.000000000 -0700 --- a/cmake/build_configurations/compiler_options.cmake 2016-12-19 09:18:07.169866414 +0000
+++ b/cmake/build_configurations/compiler_options.cmake 2016-09-09 01:56:54.715063581 -0700 +++ b/cmake/build_configurations/compiler_options.cmake 2016-12-19 09:19:26.290338156 +0000
@@ -15,7 +15,6 @@ @@ -15,8 +15,6 @@
INCLUDE(CheckCCompilerFlag) INCLUDE(CheckCCompilerFlag)
INCLUDE(CheckCXXCompilerFlag) INCLUDE(CheckCXXCompilerFlag)
-INCLUDE(cmake/compiler_bugs.cmake)
-INCLUDE(cmake/floating_point.cmake) -INCLUDE(cmake/floating_point.cmake)
IF(SIZEOF_VOIDP EQUAL 4) IF(SIZEOF_VOIDP EQUAL 4)
SET(32BIT 1) SET(32BIT 1)
@@ -34,10 +33,6 @@ @@ -35,10 +33,6 @@
IF(WITH_VALGRIND) IF(WITH_VALGRIND)
SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
ENDIF() ENDIF()
- # Disable optimizations that change floating point results - # Disable expensive-optimization if shift-or-optimization bug effective
- IF(HAVE_C_FLOATING_POINT_OPTIMIZATION_PROBLEMS) - IF(HAVE_C_SHIFT_OR_OPTIMIZATION_BUG)
- SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations") - SET(C_NO_EXPENSIVE_OPTIMIZATIONS TRUE)
- ENDIF() - ENDIF()
SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") # Disable floating point expression contractions to avoid result differences
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") IF(HAVE_C_FLOATING_POINT_FUSED_MADD)
ENDIF() IF(HAVE_C_FP_CONTRACT_FLAG)
@@ -53,10 +48,6 @@ @@ -69,14 +63,6 @@
IF(WITH_VALGRIND) IF(HAVE_CXX_SHIFT_OR_OPTIMIZATION_BUG)
SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") SET(CXX_NO_EXPENSIVE_OPTIMIZATIONS TRUE)
ENDIF() ENDIF()
- # Disable optimizations that change floating point results - # Disable floating point expression contractions to avoid result differences
- IF(HAVE_CXX_FLOATING_POINT_OPTIMIZATION_PROBLEMS) - IF(HAVE_CXX_FLOATING_POINT_FUSED_MADD)
- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -fno-expensive-optimizations") - 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() - ENDIF()
SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") IF(CXX_NO_EXPENSIVE_OPTIMIZATIONS)
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -fno-expensive-optimizations")
ENDIF() ENDIF()
diff -Naur a/cmake/floating_point.cmake b/cmake/floating_point.cmake
--- a/cmake/floating_point.cmake 2016-07-12 04:55:26.000000000 -0700
+++ b/cmake/floating_point.cmake 1969-12-31 16:00:00.000000000 -0800
@@ -1,56 +0,0 @@
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-INCLUDE(CheckCSourceRuns)
-INCLUDE(CheckCXXSourceRuns)
-
-SET(code "
- int main (int argc, char **argv)
- {
- double n[21] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 1, 1, 1, 1, 1, 1,1 };
- double m= 0, s= 0;
- int i;
- for(i= 0; i < 21; i++)
- {
- double m_kminusone= m;
- m= m_kminusone + (n[i] - m_kminusone) / (double) (i + 2);
- s= s + (n[i] - m_kminusone) * (n[i] - m);
- }
- /*
- s should now be either 5e 74 d1 45 17 5d 14 40 or
- 40 14 5d 17 45 d1 74 5e, depending on endianness. If the floating point
- operations are over optimized, the least significant byte is 5d instead
- of 5e.
- */
- return (*(unsigned char*)(&s) == 0x5e ||
- *((unsigned char*)(&s) + 7) == 0x5e);
- }"
-)
-
-SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-SET(CMAKE_REQUIRED_FLAGS
- "${CMAKE_REQUIRED_FLAGS} -O3 -fexpensive-optimizations"
-)
-
-IF(CMAKE_COMPILER_IS_GNUCC)
- CHECK_C_SOURCE_RUNS("${code}" HAVE_C_FLOATING_POINT_OPTIMIZATION_PROBLEMS)
-ENDIF()
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
- CHECK_CXX_SOURCE_RUNS("${code}" HAVE_CXX_FLOATING_POINT_OPTIMIZATION_PROBLEMS)
-ENDIF()
-
-SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")