aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Urankar <mikael@FreeBSD.org>2024-02-17 20:22:15 +0000
committerRainer Hurling <rhurlin@FreeBSD.org>2024-02-17 20:22:15 +0000
commit6dbc3df04ebbe95dcad623ce76554fb52e26be3d (patch)
tree4bf92e784912c003bfe9af9c5df7a17f3cdabc79
parent78282c6c7261f77810d8fe5026f3eacca0276fda (diff)
downloadports-6dbc3df04ebbe95dcad623ce76554fb52e26be3d.tar.gz
ports-6dbc3df04ebbe95dcad623ce76554fb52e26be3d.zip
devel/android-tools: Fix build, include functional
While here, pet portlint. PR: 276983 Reported by: Ale <discipline@tiscali.it> MFH: 2024Q1
-rw-r--r--devel/android-tools/Makefile5
-rw-r--r--devel/android-tools/files/patch-vendor_adb_tls_include_adb_tls_tls__connection.h10
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>