Skip to content

Commit 4c5a640

Browse files
bkandasadahlerlend
authored andcommitted
Add support for arm builds
1 parent 6e5f896 commit 4c5a640

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

packaging/rpm-docker/mysql.spec.in

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@ Vendor: %{mysql_vendor}
6060
Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
6161
Source1: https://downloads.sourceforge.net/boost/@[email protected]
6262
BuildRequires: cmake >= 2.8.2
63+
%ifarch aarch64
64+
BuildRequires: gcc7
65+
BuildRequires: gcc7-c++
66+
%else
67+
BuildRequires: devtoolset-7-gcc
68+
BuildRequires: devtoolset-7-gcc-c++
69+
%endif
6370
BuildRequires: perl
6471
BuildRequires: perl(Time::HiRes)
6572
BuildRequires: perl(Env)
@@ -143,6 +150,10 @@ mkdir release
143150
cd release
144151
cmake ../%{src_dir} \
145152
-DBUILD_CONFIG=mysql_release \
153+
%ifarch aarch64
154+
-DCMAKE_C_COMPILER=/usr/bin/gcc7 \
155+
-DCMAKE_CXX_COMPILER=/usr/bin/g++7 \
156+
%endif
146157
-DINSTALL_LAYOUT=RPM \
147158
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
148159
-DWITH_BOOST=.. \

packaging/rpm-oel/mysql.spec.in

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,13 @@ Source7: %{compatsrc}
107107
Source10: https://downloads.sourceforge.net/boost/@[email protected]
108108
Source90: filter-provides.sh
109109
Source91: filter-requires.sh
110+
%ifarch aarch64
111+
BuildRequires: gcc7
112+
BuildRequires: gcc7-c++
113+
%else
110114
BuildRequires: devtoolset-7-gcc
111115
BuildRequires: devtoolset-7-gcc-c++
116+
%endif
112117
BuildRequires: cmake >= 2.8.2
113118
BuildRequires: perl
114119
%{?el7:BuildRequires: perl(Env)}
@@ -685,6 +690,10 @@ mkdir debug
685690
optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
686691
cmake ../%{src_dir} \
687692
-DBUILD_CONFIG=mysql_release \
693+
%ifarch aarch64
694+
-DCMAKE_C_COMPILER=/usr/bin/gcc7 \
695+
-DCMAKE_CXX_COMPILER=/usr/bin/g++7 \
696+
%endif
688697
-DINSTALL_LAYOUT=RPM \
689698
-DCMAKE_BUILD_TYPE=Debug \
690699
-DWITH_BOOST=.. \
@@ -727,6 +736,10 @@ mkdir release
727736
cd release
728737
cmake ../%{src_dir} \
729738
-DBUILD_CONFIG=mysql_release \
739+
%ifarch aarch64
740+
-DCMAKE_C_COMPILER=/usr/bin/gcc7 \
741+
-DCMAKE_CXX_COMPILER=/usr/bin/g++7 \
742+
%endif
730743
-DINSTALL_LAYOUT=RPM \
731744
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
732745
-DWITH_BOOST=.. \

0 commit comments

Comments
 (0)