rpms/mysql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

[2/2] Update to MySQL 8.0.29 - fix of Boost on ppc64le

Browse Source 
--

Related: #2117219
This commit is contained in:
Terje Rosten 2022-06-20 13:53:45 +02:00 committed by Michal Schorm
parent d6b6c65604
commit 73eb40a2b0
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch Normal file
View File

@ -0,0 +1,27 @@
From d1343f28dcbe25b100b082b34775bd92ead4602c Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Tue, 25 Jan 2022 09:27:40 +0000
Subject: [PATCH] Update gcc Intel intrinsic usage config. Fixes
https://github.com/boostorg/multiprecision/issues/419.
---
include/boost/multiprecision/cpp_int/intel_intrinsics.hpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
index eb4624bb4..37717cd51 100644
--- a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
+++ b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
@@ -19,7 +19,11 @@
// If this is GCC/clang, then check that the actual intrinsic exists:
//
#if defined(__has_builtin) && defined(__GNUC__)
-#if !__has_builtin(__builtin_ia32_addcarryx_u64) && defined(BOOST_MP_HAS_IMMINTRIN_H) && !(defined(BOOST_GCC) && (__GNUC__ >= 9))
+#if !__has_builtin(__builtin_ia32_addcarryx_u64) && defined(BOOST_MP_HAS_IMMINTRIN_H) \
+ && !(defined(BOOST_GCC) && (__GNUC__ >= 9) \
+ && (defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)\
+ || defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_AMD64) \
+ || defined(_M_X64) || defined(__amd64__) || defined(_M_X64)))
#undef BOOST_MP_HAS_IMMINTRIN_H
#endif
#elif defined(BOOST_MP_HAS_IMMINTRIN_H) && defined(__GNUC__) && !(defined(BOOST_GCC) && (__GNUC__ >= 9))

4
mysql.spec
View File

@ -126,6 +126,9 @@ Patch80: %{pkgnamepatch}-fix-includes-robin-hood.patch
Patch115: boost-1.58.0-pool.patch
Patch125: boost-1.57.0-mpl-print.patch
# Patches taken from boost 1.76
Patch126: boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libaio-devel
@ -399,6 +402,7 @@ the MySQL sources.
pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
%patch115 -p0
%patch125 -p1
%patch126 -p2
popd
# generate a list of tests that fail, but are not disabled by upstream

4
rh-skipped-tests-list-base.list
View File

@ -49,3 +49,7 @@ main.loaddata_special : BUG#0
innodb.trigger_function_lock_compare : BUG#0
# Failing only in i686 since MySQL 8.0.28
main.index_merge_myisam : BUG#0
# Failing since MySQL 8.0.29
main.mysqlpump_bugs : BUG#0
main.slow_log : BUG#0