wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

android-tools: correctly build with go1.20

Browse source 
Closes: #45771.
This commit is contained in:
Andrew J. Hesford 2023-08-25 19:50:22 -04:00
parent e130a8107c
commit 4b592188bf
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/android-tools/patches/go1.20.patch
View file

@ -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)

3
srcpkgs/android-tools/template
View file

@ -4,8 +4,7 @@ version=34.0.1
revision=3 revision=3
archs="armv* aarch64* x86_64* i686* ppc64le*" archs="armv* aarch64* x86_64* i686* ppc64le*"
build_style=cmake build_style=cmake
configure_args="-DGO_EXECUTABLE=/usr/bin/go1.20" hostmakedepends="perl go go1.20 protobuf pkg-config"
hostmakedepends="perl go1.20 protobuf pkg-config"
makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel" liblz4-devel libzstd-devel protobuf-devel brotli-devel"
depends="python3" depends="python3"