[PR PATCH] android-tools: fix configure_args.

[PR PATCH] android-tools: fix configure_args.

[atweiden]

[-- Attachment #1: Type: text/plain, Size: 481 bytes --]

There is a new pull request by atweiden against master on the void-packages repository

https://github.com/atweiden/void-packages android-tools
https://github.com/void-linux/void-packages/pull/45771

android-tools: fix configure_args.
#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, N/A

A patch file from https://github.com/void-linux/void-packages/pull/45771.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-45771.patch --]
[-- Type: text/x-diff, Size: 1095 bytes --]

From e5e2768c62e7cdd900c5c4aacb5453957c7231be Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Fri, 25 Aug 2023 22:06:26 +0000
Subject: [PATCH] android-tools: fix configure_args.

---
 srcpkgs/android-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 351bdfef88df6..e286ce5112411 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'android-tools'
 pkgname=android-tools
 version=34.0.1
-revision=3
+revision=4
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 configure_args="-DGO_EXECUTABLE=/usr/bin/go1.20"
@@ -17,7 +17,7 @@ distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/a
 checksum=60234ecbca19a17a7e2f46a4581960d645b7c55b870d924a21494c76a6f548ec
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 
 export GOTOOLCHAIN=go1.20

Re: [PR PATCH] [Closed]: android-tools: fix configure_args.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There's a closed pull request on the void-packages repository

android-tools: fix configure_args.
https://github.com/void-linux/void-packages/pull/45771

Description:
#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, N/A

Re: android-tools: fix configure_args.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45771#issuecomment-1694052309

Comment:
Thanks for catching this. Overwriting `configure_args` explains why I needed to patch `CMakeLists.txt` for cross-builds. The right thing to do here is drop the `GO_EXECUTABLE` override and `CMakeLists.txt` patch, allowing the combination of `go` and `go1.20` to do the right thing with `GOTOOLCHAIN` set. There's no need for a revbump because the package won't be built any differently.