diff --git a/aarch64.patch b/aarch64.patch deleted file mode 100644 index 8c3c85c35..000000000 --- a/aarch64.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/.bazelversion b/.bazelversion -index 3eefcb9..0b2eb36 100644 ---- a/.bazelversion -+++ b/.bazelversion -@@ -1 +1 @@ --1.0.0 -+3.7.2 -diff --git a/bazel/zetasql_deps_step_2.bzl b/bazel/zetasql_deps_step_2.bzl -index 1a74849..168a24a 100644 ---- a/bazel/zetasql_deps_step_2.bzl -+++ b/bazel/zetasql_deps_step_2.bzl -@@ -107,9 +107,9 @@ cc_proto_library( - http_archive( - name = "com_google_absl", - # Commit from 2021-02-23 -- url = "https://github.com/abseil/abseil-cpp/archive/a50ae369a30f99f79d7559002aba3413dac1bd48.tar.gz", -- sha256 = "be2a9d7ea7ee15f9317b57beff37e8ffb67418fb0df64592366b04c8618c2584", -- strip_prefix = "abseil-cpp-a50ae369a30f99f79d7559002aba3413dac1bd48", -+ url = "https://github.com/abseil/abseil-cpp/archive/2e94e5b6e152df9fa9c2fe8c1b96e1393973d32c.zip", -+ sha256 = "485f7488f2102edd702d1cac1c30f30efa6f3bc793999aeb92f161b2dbe707dd", -+ strip_prefix = "abseil-cpp-2e94e5b6e152df9fa9c2fe8c1b96e1393973d32c", - ) - - # Abseil (Python) diff --git a/bazel/zetasql_deps_step_2.bzl b/bazel/zetasql_deps_step_2.bzl index 1a748497e..fa7545a57 100644 --- a/bazel/zetasql_deps_step_2.bzl +++ b/bazel/zetasql_deps_step_2.bzl @@ -106,10 +106,9 @@ cc_proto_library( # http_archive( name = "com_google_absl", - # Commit from 2021-02-23 - url = "https://github.com/abseil/abseil-cpp/archive/a50ae369a30f99f79d7559002aba3413dac1bd48.tar.gz", - sha256 = "be2a9d7ea7ee15f9317b57beff37e8ffb67418fb0df64592366b04c8618c2584", - strip_prefix = "abseil-cpp-a50ae369a30f99f79d7559002aba3413dac1bd48", + url = "https://github.com/abseil/abseil-cpp/archive/2e94e5b6e152df9fa9c2fe8c1b96e1393973d32c.zip", + sha256 = "485f7488f2102edd702d1cac1c30f30efa6f3bc793999aeb92f161b2dbe707dd", + strip_prefix = "abseil-cpp-2e94e5b6e152df9fa9c2fe8c1b96e1393973d32c", ) # Abseil (Python) diff --git a/build_zetasql_parser.sh b/build_zetasql_parser.sh index b9973ac50..6442bd3cb 100755 --- a/build_zetasql_parser.sh +++ b/build_zetasql_parser.sh @@ -21,12 +21,6 @@ set -eE pushd "$(dirname "$0")" pushd "$(git rev-parse --show-toplevel)" -if [[ $(arch) = 'aarch64' ]]; then - git checkout . - # need upgrade abseil and bazel to compile on aarch64 - git apply --verbose aarch64.patch -fi - echo "build with python: $(python -V), python3: $(python3 -V)" #=== FUNCTION ================================================================