git: 6dbc3df04ebb - main - devel/android-tools: Fix build, include functional
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 17 Feb 2024 20:31:31 UTC
The branch main has been updated by rhurlin:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6dbc3df04ebbe95dcad623ce76554fb52e26be3d
commit 6dbc3df04ebbe95dcad623ce76554fb52e26be3d
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-02-17 20:22:15 +0000
Commit: Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2024-02-17 20:22:15 +0000
devel/android-tools: Fix build, include functional
While here, pet portlint.
PR: 276983
Reported by: Ale <discipline@tiscali.it>
MFH: 2024Q1
---
devel/android-tools/Makefile | 5 +++--
.../patch-vendor_adb_tls_include_adb_tls_tls__connection.h | 10 ++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile
index 12cd95a7da59..699c99f8e4d8 100644
--- a/devel/android-tools/Makefile
+++ b/devel/android-tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= android-tools
PORTVERSION= 31.0.3p2.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= devel
MASTER_SITES= GH
@@ -31,9 +31,10 @@ SHEBANG_FILES= vendor/mkbootimg/repack_bootimg.py \
vendor/mkbootimg/mkbootimg.py \
vendor/mkbootimg/unpack_bootimg.py
-LDFLAGS+= -labsl_status
MAKE_ENV+= GOFLAGS=-mod=vendor \
GOPATH=${WRKSRC}/vendor/boringssl/vendor \
GOPROXY=off
+LDFLAGS+= -labsl_status
+
.include <bsd.port.mk>
diff --git a/devel/android-tools/files/patch-vendor_adb_tls_include_adb_tls_tls__connection.h b/devel/android-tools/files/patch-vendor_adb_tls_include_adb_tls_tls__connection.h
new file mode 100644
index 000000000000..afc4ed589316
--- /dev/null
+++ b/devel/android-tools/files/patch-vendor_adb_tls_include_adb_tls_tls__connection.h
@@ -0,0 +1,10 @@
+--- vendor/adb/tls/include/adb/tls/tls_connection.h.orig 2024-02-11 15:40:31 UTC
++++ vendor/adb/tls/include/adb/tls/tls_connection.h
+@@ -21,6 +21,7 @@
+
+ #include <string_view>
+ #include <vector>
++#include <functional>
+
+ #include <android-base/unique_fd.h>
+ #include <openssl/ssl.h>