From c233e74efa06584f6b388baa19b82461c9900a36 Mon Sep 17 00:00:00 2001
From: chen_yuxiang <chenyuxiang8@huawei.com>
Date: Tue, 30 Jun 2020 22:24:23 +0800
Subject: [PATCH] Add support for arm builds

---
 mysql-5.7.27/packaging/rpm-docker/mysql.spec.in | 11 +++++++++++
 mysql-5.7.27/packaging/rpm-oel/mysql.spec.in    | 15 +++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/mysql-5.7.27/packaging/rpm-docker/mysql.spec.in b/mysql-5.7.27/packaging/rpm-docker/mysql.spec.in
index b93b9a7f..eea8147d 100644
--- a/mysql-5.7.27/packaging/rpm-docker/mysql.spec.in
+++ b/mysql-5.7.27/packaging/rpm-docker/mysql.spec.in
@@ -52,6 +52,13 @@ Vendor:         %{mysql_vendor}
 Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
 Source1:        https://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
 BuildRequires:  cmake >= 2.8.2
+%ifarch aarch64
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
+%else
+BuildRequires:  devtoolset-7-gcc
+BuildRequires:  devtoolset-7-gcc-c++
+%endif
 BuildRequires:  perl
 BuildRequires:  perl(Time::HiRes)
 BuildRequires:  perl(Env)
@@ -135,6 +142,10 @@ mkdir release
   cd release
   cmake ../%{src_dir} \
            -DBUILD_CONFIG=mysql_release \
+%ifarch aarch64
+           -DCMAKE_C_COMPILER=/usr/bin/gcc7  \
+           -DCMAKE_CXX_COMPILER=/usr/bin/g++7  \
+%endif
            -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	   -DWITH_BOOST=.. \
diff --git a/mysql-5.7.27/packaging/rpm-oel/mysql.spec.in b/mysql-5.7.27/packaging/rpm-oel/mysql.spec.in
index c106333d..bc0027d4 100644
--- a/mysql-5.7.27/packaging/rpm-oel/mysql.spec.in
+++ b/mysql-5.7.27/packaging/rpm-oel/mysql.spec.in
@@ -121,6 +121,13 @@ Source7:        %{compatsrc}
 Source10:       https://downloads.sourceforge.net/boost/@BOOST_PACKAGE_NAME@.tar.bz2
 Source90:       filter-provides.sh
 Source91:       filter-requires.sh
+%ifarch aarch64
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
+%else
+BuildRequires:  devtoolset-7-gcc
+BuildRequires:  devtoolset-7-gcc-c++
+%endif
 %{?el5:BuildRequires:  cmake28 >= 2.8.2}
 %{?el6:BuildRequires:  cmake28 >= 2.8.2}
 %{?el7:BuildRequires:  cmake >= 2.8.2}
@@ -746,6 +753,10 @@ mkdir debug
   optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
   cmake%{?el5:28}%{?el6:28} ../%{src_dir} \
            -DBUILD_CONFIG=mysql_release \
+%ifarch aarch64
+           -DCMAKE_C_COMPILER=/usr/bin/gcc7  \
+           -DCMAKE_CXX_COMPILER=/usr/bin/g++7  \
+%endif
            -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=Debug \
            -DWITH_BOOST=.. \
@@ -781,6 +792,10 @@ mkdir release
   cd release
   cmake%{?el5:28}%{?el6:28} ../%{src_dir} \
            -DBUILD_CONFIG=mysql_release \
+%ifarch aarch64
+           -DCMAKE_C_COMPILER=/usr/bin/gcc7  \
+           -DCMAKE_CXX_COMPILER=/usr/bin/g++7  \
+%endif
            -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	   -DWITH_BOOST=.. \
-- 
Gitee