android-tools: correctly build with go1.20

Closes: #45771.
2023-08-25 19:50:22 -04:00 · 2023-08-25 19:50:22 -04:00 · 4b592188bf
commit 4b592188bf
parent e130a8107c
2 changed files with 1 additions and 13 deletions
--- a/srcpkgs/android-tools/patches/go1.20.patch
+++ b/srcpkgs/android-tools/patches/go1.20.patch
@ -1,11 +0,0 @@
--- a/vendor/boringssl/CMakeLists.txt
-+++ b/vendor/boringssl/CMakeLists.txt
-@@ -38,7 +38,7 @@
-   endif()
- else()
-   find_package(Perl REQUIRED)
-  find_program(GO_EXECUTABLE go)
-+  find_program(GO_EXECUTABLE NAMES go go1.20)
- endif()
- 
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_CROSSCOMPILING)
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@ -4,8 +4,7 @@ version=34.0.1
 revision=3
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
-configure_args="-DGO_EXECUTABLE=/usr/bin/go1.20"
-hostmakedepends="perl go1.20 protobuf pkg-config"
+hostmakedepends="perl go go1.20 protobuf pkg-config"
 makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
 liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 depends="python3"