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

[Feature] support mac m1 #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Feature] support mac m1 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ IMAGE_NAME_TOOLCHAIN='toolchain'
IMAGE_NAME_THIRDPARTY='dev-env'

MACHINE_TYPE=$(uname -m)
# handle mac m1 platform, change arm64 to aarch64
if [[ "${MACHINE_TYPE}" == "arm64" ]]; then
MACHINE_TYPE="aarch64"
fi

echo "===== build image on $MACHINE_TYPE"

PARAMS_TARGET=params_source_$MACHINE_TYPE.sh
Expand Down
2 changes: 1 addition & 1 deletion install_env_gcc_aarch64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ yum install centos-release-scl -y
yum install devtoolset-10 -y
ln -sf /opt/rh/devtoolset-10/root/bin/* /usr/bin/

yum install -y epel-release
#yum install -y epel-release
yum install -y ccache python3
yum install -y bzip2 wget git libstdc++-static byacc flex automake libtool binutils-devel bison ncurses-devel make mlocate unzip patch which vim-common redhat-lsb-core zip libcurl-devel updatedb
7 changes: 6 additions & 1 deletion sr-thirdparty/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,9 @@ COPY thirdparty ${DEFAULT_DIR}/thirdparty
ENV STARROCKS_THIRDPARTY /var/local/thirdparty
ENV STARROCKS_GCC_HOME /usr

CMD top
# reinstall maven and ccache because this two libs counld be installed failed before.
RUN yum install -y epel-release
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the toolchain docker image need these libs?

RUN yum install -y maven
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that maven has been installed with a pre-built binary. Is this necessary?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case that install fail before. In my env, I got some failure when install mvn and ccache in pre-built...

RUN yum install -y ccache

CMD top