diff --git a/ci/build_container/build_container_common.sh b/ci/build_container/build_container_common.sh index 0fe5b73257cd8..6ee5b153ec542 100755 --- a/ci/build_container/build_container_common.sh +++ b/ci/build_container/build_container_common.sh @@ -5,7 +5,7 @@ SHA256=0dea01a7a511797878f486e6ed8e549980c0710a0a116c8ee953d4e26de41515 # buildifier curl --location --output /usr/local/bin/buildifier https://github.com/bazelbuild/buildtools/releases/download/"$VERSION"/buildifier \ - && echo "$SHA256" '/usr/local/bin/buildifier' | sha256sum --check \ + && echo "$SHA256 " '/usr/local/bin/buildifier' | shasum -a 256 --check \ && chmod +x /usr/local/bin/buildifier # GCC for everything. diff --git a/ci/build_container/build_recipes/cares.sh b/ci/build_container/build_recipes/cares.sh index 05bb6ea5ab051..230c8323ba9c1 100755 --- a/ci/build_container/build_recipes/cares.sh +++ b/ci/build_container/build_recipes/cares.sh @@ -12,7 +12,7 @@ CPPFLAGS="$(for f in $CXXFLAGS; do if [[ $f =~ -D.* ]]; then echo $f; fi; done | CFLAGS="$(for f in $CXXFLAGS; do if [[ ! $f =~ -D.* ]]; then echo $f; fi; done | tr '\n' ' ')" curl https://github.com/c-ares/c-ares/archive/"$VERSION".tar.gz -sLo c-ares-"$VERSION".tar.gz \ - && echo "$SHA256" c-ares-"$VERSION".tar.gz | sha256sum --check + && echo "$SHA256 " c-ares-"$VERSION".tar.gz | shasum -a 256 --check tar xf c-ares-"$VERSION".tar.gz cd c-ares-"$VERSION" diff --git a/ci/build_container/build_recipes/gperftools.sh b/ci/build_container/build_recipes/gperftools.sh index 416297ed6a6b3..3bc16a4656ee5 100755 --- a/ci/build_container/build_recipes/gperftools.sh +++ b/ci/build_container/build_recipes/gperftools.sh @@ -10,7 +10,7 @@ VERSION=2.7 SHA256=1ee8c8699a0eff6b6a203e59b43330536b22bbcbe6448f54c7091e5efb0763c9 curl https://github.com/gperftools/gperftools/releases/download/gperftools-"$VERSION"/gperftools-"$VERSION".tar.gz -sLo gperftools-"$VERSION".tar.gz \ - && echo "$SHA256" gperftools-"$VERSION".tar.gz | sha256sum --check + && echo "$SHA256 " gperftools-"$VERSION".tar.gz | shasum -a 256 --check tar xf gperftools-"$VERSION".tar.gz cd gperftools-"$VERSION" diff --git a/ci/build_container/build_recipes/libevent.sh b/ci/build_container/build_recipes/libevent.sh index 75201d88dee4c..50701feba45af 100755 --- a/ci/build_container/build_recipes/libevent.sh +++ b/ci/build_container/build_recipes/libevent.sh @@ -6,7 +6,7 @@ VERSION=2.1.8-stable SHA256=316ddb401745ac5d222d7c529ef1eada12f58f6376a66c1118eee803cb70f83d curl https://github.com/libevent/libevent/archive/release-"$VERSION".tar.gz -sLo libevent-release-"$VERSION".tar.gz \ - && echo "$SHA256" libevent-release-"$VERSION".tar.gz | sha256sum --check + && echo "$SHA256 " libevent-release-"$VERSION".tar.gz | shasum -a 256 --check tar xf libevent-release-"$VERSION".tar.gz cd libevent-release-"$VERSION" diff --git a/ci/build_container/build_recipes/luajit.sh b/ci/build_container/build_recipes/luajit.sh index 7408968973a9f..b4ddceb1d1496 100644 --- a/ci/build_container/build_recipes/luajit.sh +++ b/ci/build_container/build_recipes/luajit.sh @@ -6,10 +6,11 @@ VERSION=2.0.5 SHA256=8bb29d84f06eb23c7ea4aa4794dbb248ede9fcb23b6989cbef81dc79352afc97 curl https://github.com/LuaJIT/LuaJIT/archive/v"$VERSION".tar.gz -sLo LuaJIT-"$VERSION".tar.gz \ - && echo "$SHA256" LuaJIT-"$VERSION".tar.gz | sha256sum --check + && echo "$SHA256 " LuaJIT-"$VERSION".tar.gz | shasum -a 256 --check tar xf LuaJIT-"$VERSION".tar.gz cd LuaJIT-"$VERSION" + # Fixup Makefile with things that cannot be set via env var. cat > ../luajit_make.diff << 'EOF' diff --git a/src/Makefile b/src/Makefile @@ -69,5 +70,9 @@ if [[ "${OS}" == "Windows_NT" ]]; then else patch -p1 < ../luajit_make.diff - DEFAULT_CC=${CC} TARGET_CFLAGS=${CFLAGS} TARGET_LDFLAGS=${CFLAGS} CFLAGS="" make V=1 PREFIX="$THIRDPARTY_BUILD" install + # Default MACOSX_DEPLOYMENT_TARGET is 10.4, which will fail the build at link time on macOS 10.14: + # ld: library not found for -lgcc_s.10.4 + # This doesn't affect other platforms + MACOSX_DEPLOYMENT_TARGET=10.6 DEFAULT_CC=${CC} TARGET_CFLAGS=${CFLAGS} TARGET_LDFLAGS=${CFLAGS} \ + CFLAGS="" make V=1 PREFIX="$THIRDPARTY_BUILD" install fi diff --git a/ci/build_container/build_recipes/nghttp2.sh b/ci/build_container/build_recipes/nghttp2.sh index ce999fff00e3f..b34d4c392a1da 100755 --- a/ci/build_container/build_recipes/nghttp2.sh +++ b/ci/build_container/build_recipes/nghttp2.sh @@ -6,7 +6,7 @@ VERSION=1.33.0 SHA256=42fff7f290100c02234ac3b0095852e4392e6bfd95ebed900ca8bd630850d88c curl https://github.com/nghttp2/nghttp2/releases/download/v"$VERSION"/nghttp2-"$VERSION".tar.gz -sLo nghttp2-"$VERSION".tar.gz \ - && echo "$SHA256" nghttp2-"$VERSION".tar.gz | sha256sum --check + && echo "$SHA256 " nghttp2-"$VERSION".tar.gz | shasum -a 256 --check tar xf nghttp2-"$VERSION".tar.gz cd nghttp2-"$VERSION" diff --git a/ci/build_container/build_recipes/yaml-cpp.sh b/ci/build_container/build_recipes/yaml-cpp.sh index 59253e93798ff..8ca349fa8351d 100755 --- a/ci/build_container/build_recipes/yaml-cpp.sh +++ b/ci/build_container/build_recipes/yaml-cpp.sh @@ -7,7 +7,7 @@ COMMIT=0f9a586ca1dc29c2ecb8dd715a315b93e3f40f79 # 2018-06-30 SHA256=53dcffd55f3433b379fcc694f45c54898711c0e29159a7bd02e82a3e0253bac3 curl https://github.com/jbeder/yaml-cpp/archive/"$COMMIT".tar.gz -sLo yaml-cpp-"$COMMIT".tar.gz \ - && echo "$SHA256" yaml-cpp-"$COMMIT".tar.gz | sha256sum --check + && echo "$SHA256 " yaml-cpp-"$COMMIT".tar.gz | shasum -a 256 --check tar xf yaml-cpp-"$COMMIT".tar.gz cd yaml-cpp-"$COMMIT" diff --git a/ci/build_container/build_recipes/zlib.sh b/ci/build_container/build_recipes/zlib.sh index c29aeee7dea81..3ca451c3618c3 100644 --- a/ci/build_container/build_recipes/zlib.sh +++ b/ci/build_container/build_recipes/zlib.sh @@ -6,7 +6,7 @@ VERSION=1.2.11 SHA256=629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff curl https://github.com/madler/zlib/archive/v"$VERSION".tar.gz -sLo zlib-"$VERSION".tar.gz \ - && echo "$SHA256" zlib-"$VERSION".tar.gz | sha256sum --check + && echo "$SHA256 " zlib-"$VERSION".tar.gz | shasum -a 256 --check tar xf zlib-"$VERSION".tar.gz cd zlib-"$VERSION" diff --git a/ci/mac_ci_steps.sh b/ci/mac_ci_steps.sh index 253f2acec0d35..c8e09228c1f32 100755 --- a/ci/mac_ci_steps.sh +++ b/ci/mac_ci_steps.sh @@ -2,11 +2,6 @@ set -e -# Add non-g prefixed coreutils installed sha256sum to the path -# allowing us to check the sha of dependencies downloaded in -# ci/build_container/build_recipes/*.sh -export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" - . "$(dirname "$0")"/setup_gcs_cache.sh BAZEL_BUILD_OPTIONS="--curses=no --show_task_finish --verbose_failures ${BAZEL_BUILD_EXTRA_OPTIONS}"