From a34f528606a20d1e36cb4bdd7e3009884877f098 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Fri, 1 Nov 2019 12:36:05 +0100
Subject: [PATCH] Add missing dependency Disable linking with GOLD on Armv7hl
because of https://bugs.mysql.com/bug.php?id=96698
---
community-mysql.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/community-mysql.spec b/community-mysql.spec
index 43ab5ea..0573b83 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -120,6 +120,7 @@ BuildRequires: lz4
BuildRequires: lz4-devel
BuildRequires: mecab-devel
BuildRequires: bison
+BuildRequires: libzstd-devel
%ifnarch aarch64 %{arm} s390 s390x
BuildRequires: numactl-devel
%endif
@@ -442,7 +443,7 @@ cmake .. \
%ifnarch aarch64 %{arm} s390 s390x
-DWITH_NUMA=ON \
%endif
-%ifarch s390 s390x
+%ifarch s390 s390x armv7hl
-DUSE_LD_GOLD=OFF \
%endif
-DWITH_ROUTER=OFF \
@@ -459,6 +460,8 @@ cmake .. \
-DCMAKE_C_LINK_FLAGS="%{build_ldflags}" \
-DCMAKE_CXX_LINK_FLAGS"%{build_ldflags}"
+# Note: linking with GOLD disabled on Armv7hl because of https://bugs.mysql.com/bug.php?id=96698
+
cmake .. -LAH
make %{?_smp_mflags} VERBOSE=1
diff --git a/sources b/sources
index 320900b..555f703 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-boost-8.0.17.tar.gz) = a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d
+SHA512 (mysql-boost-8.0.18.tar.gz) = 180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5