diff --git a/testing/bazel2/APKBUILD b/testing/bazel2/APKBUILD index b67d9a2a9460f058522f04a2f2f6c62742716903..d18244a5de4fc996c6656176d2fece2b4d7d6a48 100644 --- a/testing/bazel2/APKBUILD +++ b/testing/bazel2/APKBUILD @@ -8,7 +8,7 @@ url="https://bazel.build/" arch="x86_64" license="Apache-2.0" depends="bash libarchive openjdk8 zip unzip" -makedepends="python3 linux-headers protobuf" +makedepends="python3 linux-headers protobuf coreutils" options="!strip" replaces="bazel" provides="bazel=$pkgver-r$pkgrel" @@ -18,8 +18,7 @@ subpackages=" $pkgname-zsh-completion $pkgname-examples::noarch " -source="https://github.com/bazelbuild/bazel/releases/download/$pkgver/bazel-$pkgver-dist.zip - bash_completion.patch" +source="https://github.com/bazelbuild/bazel/releases/download/$pkgver/bazel-$pkgver-dist.zip" build() { # based on @@ -89,5 +88,4 @@ unpack() { unzip "$srcdir"/bazel-$pkgver-dist.zip -d "$builddir" > /dev/null } -sha512sums="67011c3a045c0fd74cdcb98eef1c3ead6902a3bd65a629fe49911f9dbb4c39508bd91eb63c1fae68284136ad4994afb42a01c7f10983614e432f8be22a1c566e bazel-2.2.0-dist.zip -6eb1fcb553518348f5c2dacf239377dbaa2593b751ba98c0c257d0138c55b159891fa3744168a6cff8b305758c64f9153cdc01dd3394b5fff2168319188288df bash_completion.patch" +sha512sums="67011c3a045c0fd74cdcb98eef1c3ead6902a3bd65a629fe49911f9dbb4c39508bd91eb63c1fae68284136ad4994afb42a01c7f10983614e432f8be22a1c566e bazel-2.2.0-dist.zip" diff --git a/testing/bazel2/bash_completion.patch b/testing/bazel2/bash_completion.patch deleted file mode 100644 index 74cedc6a7737ca3151db9e7e1a98862835298f68..0000000000000000000000000000000000000000 --- a/testing/bazel2/bash_completion.patch +++ /dev/null @@ -1,13 +0,0 @@ -Bash completion patch to fix error in expr - ---- a/scripts/generate_bash_completion.sh.orig -+++ a/scripts/generate_bash_completion.sh -@@ -34,7 +34,7 @@ - } - - get_optarg() { -- expr -- "${1}" : "[^=]*=\\(.*\\)" -+ expr "${1}" : "[^=]*=\\(.*\\)" - } - - append=