Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ceph.spec: use devtoolset-6-gcc-c++ on aarch64 #19341

Merged
merged 2 commits into from
Dec 8, 2017
Merged

ceph.spec: use devtoolset-6-gcc-c++ on aarch64 #19341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4068217
ceph.spec: use devtoolset-6-gcc-c++ on aarch64
tchaikov Dec 5, 2017
84660c9
install-deps.sh: install centos-release-scl-rh on aarch64
tchaikov Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions ceph.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,12 @@ BuildRequires: fuse-devel
%if 0%{?rhel} == 7
# devtoolset offers newer make and valgrind-devel, but the old ones are good
# enough.
%ifarch x86_64
BuildRequires: devtoolset-7-gcc-c++
%endif
%ifarch aarch64
BuildRequires: devtoolset-6-gcc-c++
%endif
%else
BuildRequires: gcc-c++
%endif
Expand Down Expand Up @@ -789,8 +794,13 @@ python-rbd, python-rgw or python-cephfs instead.
%build

%if 0%{?rhel} == 7
%ifarch x86_64
. /opt/rh/devtoolset-7/enable
%endif
%ifarch aarch64
. /opt/rh/devtoolset-6/enable
%endif
%endif

%if 0%{with cephfs_java}
# Find jni.h
Expand Down
7 changes: 6 additions & 1 deletion install-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,12 @@ else
$SUDO rm -f /etc/yum.repos.d/dl.fedoraproject.org*
if test $(lsb_release -si) = CentOS -a $MAJOR_VERSION = 7 ; then
$SUDO yum-config-manager --enable cr
$SUDO yum install centos-release-scl
case $(uname -m) in
x86_64)
$SUDO yum install centos-release-scl;;
aarch64)
$SUDO yum install centos-release-scl-rh;;
esac
elif test $(lsb_release -si) = RedHatEnterpriseServer -a $MAJOR_VERSION = 7 ; then
$SUDO yum-config-manager --enable rhel-server-rhscl-7-rpms
elif test $(lsb_release -si) = VirtuozzoLinux -a $MAJOR_VERSION = 7 ; then
Expand Down