From e5ec4e21b6759caefe46ab2382a924583df91f04 Mon Sep 17 00:00:00 2001 From: Danila Kutenin Date: Mon, 11 Jan 2021 09:04:34 +0000 Subject: [PATCH] Fix Darwin build --- cmake/toolchain/darwin-x86_64/README.txt | 4 ++-- docker/packager/binary/Dockerfile | 2 +- docker/packager/binary/build.sh | 2 +- docs/en/development/build-cross-osx.md | 4 ++-- docs/es/development/build-cross-osx.md | 4 ++-- docs/fr/development/build-cross-osx.md | 4 ++-- docs/ja/development/build-cross-osx.md | 4 ++-- docs/zh/development/build-cross-osx.md | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmake/toolchain/darwin-x86_64/README.txt b/cmake/toolchain/darwin-x86_64/README.txt index 0626c9e886c..65c9aba5be6 100644 --- a/cmake/toolchain/darwin-x86_64/README.txt +++ b/cmake/toolchain/darwin-x86_64/README.txt @@ -1,2 +1,2 @@ -wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/MacOSX10.14.sdk.tar.xz -tar xJf MacOSX10.14.sdk.tar.xz --strip-components=1 +wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz +tar xJf MacOSX10.15.sdk.tar.xz --strip-components=1 diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile index 168ea895eec..74de1a3e9bd 100644 --- a/docker/packager/binary/Dockerfile +++ b/docker/packager/binary/Dockerfile @@ -82,7 +82,7 @@ RUN git clone https://github.com/tpoechtrager/cctools-port.git \ && rm -rf cctools-port # Download toolchain for Darwin -RUN wget -nv https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/MacOSX10.14.sdk.tar.xz +RUN wget -nv https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz # Download toolchain for ARM # It contains all required headers and libraries. Note that it's named as "gcc" but actually we are using clang for cross compiling. diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh index 85e2e8b0f04..a42789c6186 100755 --- a/docker/packager/binary/build.sh +++ b/docker/packager/binary/build.sh @@ -3,7 +3,7 @@ set -x -e mkdir -p build/cmake/toolchain/darwin-x86_64 -tar xJf MacOSX10.14.sdk.tar.xz -C build/cmake/toolchain/darwin-x86_64 --strip-components=1 +tar xJf MacOSX10.15.sdk.tar.xz -C build/cmake/toolchain/darwin-x86_64 --strip-components=1 mkdir -p build/cmake/toolchain/linux-aarch64 tar xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C build/cmake/toolchain/linux-aarch64 --strip-components=1 diff --git a/docs/en/development/build-cross-osx.md b/docs/en/development/build-cross-osx.md index 3e8c5419158..6f3b3a717d0 100644 --- a/docs/en/development/build-cross-osx.md +++ b/docs/en/development/build-cross-osx.md @@ -42,9 +42,9 @@ Also, we need to download macOS X SDK into the working tree. ``` bash cd ClickHouse -wget 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/MacOSX10.14.sdk.tar.xz' +wget 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz' mkdir -p build-darwin/cmake/toolchain/darwin-x86_64 -tar xJf MacOSX10.14.sdk.tar.xz -C build-darwin/cmake/toolchain/darwin-x86_64 --strip-components=1 +tar xJf MacOSX10.15.sdk.tar.xz -C build-darwin/cmake/toolchain/darwin-x86_64 --strip-components=1 ``` ## Build ClickHouse {#build-clickhouse} diff --git a/docs/es/development/build-cross-osx.md b/docs/es/development/build-cross-osx.md index 35cf01a8ce3..d00e57c5d31 100644 --- a/docs/es/development/build-cross-osx.md +++ b/docs/es/development/build-cross-osx.md @@ -44,9 +44,9 @@ Además, necesitamos descargar macOS X SDK en el árbol de trabajo. ``` bash cd ClickHouse -wget 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/MacOSX10.14.sdk.tar.xz' +wget 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz' mkdir -p build-darwin/cmake/toolchain/darwin-x86_64 -tar xJf MacOSX10.14.sdk.tar.xz -C build-darwin/cmake/toolchain/darwin-x86_64 --strip-components=1 +tar xJf MacOSX10.15.sdk.tar.xz -C build-darwin/cmake/toolchain/darwin-x86_64 --strip-components=1 ``` # Construir ClickHouse {#build-clickhouse} diff --git a/docs/fr/development/build-cross-osx.md b/docs/fr/development/build-cross-osx.md index 4fa97a65c7b..a15d4650edb 100644 --- a/docs/fr/development/build-cross-osx.md +++ b/docs/fr/development/build-cross-osx.md @@ -44,9 +44,9 @@ En outre, nous devons télécharger macOS X SDK dans l'arbre de travail. ``` bash cd ClickHouse -wget 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/MacOSX10.14.sdk.tar.xz' +wget 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz' mkdir -p build-darwin/cmake/toolchain/darwin-x86_64 -tar xJf MacOSX10.14.sdk.tar.xz -C build-darwin/cmake/toolchain/darwin-x86_64 --strip-components=1 +tar xJf MacOSX10.15.sdk.tar.xz -C build-darwin/cmake/toolchain/darwin-x86_64 --strip-components=1 ``` # Construire ClickHouse {#build-clickhouse} diff --git a/docs/ja/development/build-cross-osx.md b/docs/ja/development/build-cross-osx.md index 5d7dee09827..7444a384e05 100644 --- a/docs/ja/development/build-cross-osx.md +++ b/docs/ja/development/build-cross-osx.md @@ -45,9 +45,9 @@ make install ``` bash cd ClickHouse -wget 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/MacOSX10.14.sdk.tar.xz' +wget 'https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz' mkdir -p build-darwin/cmake/toolchain/darwin-x86_64 -tar xJf MacOSX10.14.sdk.tar.xz -C build-darwin/cmake/toolchain/darwin-x86_64 --strip-components=1 +tar xJf MacOSX10.15.sdk.tar.xz -C build-darwin/cmake/toolchain/darwin-x86_64 --strip-components=1 ``` # ビルドClickHouse {#build-clickhouse} diff --git a/docs/zh/development/build-cross-osx.md b/docs/zh/development/build-cross-osx.md index 6a941f4e834..ee3335553d3 100644 --- a/docs/zh/development/build-cross-osx.md +++ b/docs/zh/development/build-cross-osx.md @@ -33,8 +33,8 @@ cd cctools-port/cctools make install cd ${CCTOOLS} -wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/MacOSX10.14.sdk.tar.xz -tar xJf MacOSX10.14.sdk.tar.xz +wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz +tar xJf MacOSX10.15.sdk.tar.xz ``` # 编译 ClickHouse {#bian-yi-clickhouse} @@ -46,7 +46,7 @@ CC=clang-8 CXX=clang++-8 cmake . -Bbuild-osx -DCMAKE_SYSTEM_NAME=Darwin \ -DCMAKE_AR:FILEPATH=${CCTOOLS}/bin/x86_64-apple-darwin-ar \ -DCMAKE_RANLIB:FILEPATH=${CCTOOLS}/bin/x86_64-apple-darwin-ranlib \ -DLINKER_NAME=${CCTOOLS}/bin/x86_64-apple-darwin-ld \ - -DSDK_PATH=${CCTOOLS}/MacOSX10.14.sdk + -DSDK_PATH=${CCTOOLS}/MacOSX10.15.sdk ninja -C build-osx ```