From nobody Sat Feb 17 20:35:43 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TcgYC6kdYz59bGT; Sat, 17 Feb 2024 20:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TcgYC6CdLz4SJD; Sat, 17 Feb 2024 20:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708202143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RA+nx8nic+Bdx3j7kOhBPMGuIRcTgWMKdCYp+/qDA/Y=; b=BkzXzBak2tav0P5T4DuwsXX2Vql0o0keGjJUyhhIgkfYG64tLnKWmKSLmVb9R2jXThtoa0 IdSCEwGljYKdrtz2shahNBogYax+GD0h9xBIm3QL/8ZySBfPWPZwvVJpduSo5StDA1SVMA /GDguQ88PNuyaLjVZTavxAjaBfp9vegldwrxUXu5k/wN/ldlFr0nvJvUIUp4lOG2Nl9mc0 +Yta3JXDAWXSdWsJONVWg+g2L+Iz9JOMy+291+8IWG9Cpg0G5WMXQJ15Kwt2UqwCY08xkn UcbzYbhhAgLUBzWPMSYNM8u9O/TMMHDsJPVHFZg0pSlOQ8cON5gPf8/xV1xnaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708202143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RA+nx8nic+Bdx3j7kOhBPMGuIRcTgWMKdCYp+/qDA/Y=; b=s3P1RmvDS108U0wJhzvilA6Dv+P8VWCbuDqe0HOV2KngXj92cJdmTi7InqrZtxA51YLmo4 W+r8/wXCz0kR3RZZKIdMvzVe36dMPEhxizUtO9M/CWhoLc4kDtqpioAEQTUMK7e902774Z H30FBRJjEziq0S1mtLGmz33qQnx8Wd8uFiCxJ9kyoazftfEthJZSTumIta2LlwGnZpzzfT 8PfutLxE9k62amtt/nFk0ErrsSqFUCAzI6otLEg/2vwTmjoR4Y5fc1U6onFw0tcNk7d18H v4Do/t58v1hM7cCDkOrR/ckz2sSrxc7hNATyj+f0wqh7hbLCZMxsUV0yFzZVJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708202143; a=rsa-sha256; cv=none; b=X5tsbT3BLeCKY5uO4zLzuqJGDZjGQCtWt/LS+czQmD8A5uHMD5TUiMmDEZEnc90kNd0e2R HctWshb2VLzw1CSd5SUSZPaQu5shut+lWPI5Sj+zWLjKT0B28XVQ/p9jpqJQHPsFsQUuAm HduliclKCI580vec7EtWpNvTOxN+Qj64O4gGh3I5msi2Sv3HJeSMQBXokLFDY2JZOfIfXD 6Cn1IRfUz30Y9a2GLan93NmRnNiiUsEaNTlQR/2sn+mYbSIBoxa3Nxt1JM9LdcihjHc0P9 1jlJ5pIIcZR+poyHRSAdMYfLKfAMBgOdkJG8mlH6Ij+P8ryKeAP4tAVLAh/Bjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcgYC5GNSzMyq; Sat, 17 Feb 2024 20:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HKZhjZ018958; Sat, 17 Feb 2024 20:35:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HKZhBp018955; Sat, 17 Feb 2024 20:35:43 GMT (envelope-from git) Date: Sat, 17 Feb 2024 20:35:43 GMT Message-Id: <202402172035.41HKZhBp018955@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rainer Hurling Subject: git: f7acb519547e - 2024Q1 - devel/android-tools: Fix build, include functional List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: f7acb519547e2ccbd19699759a01027cc528d0c9 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7acb519547e2ccbd19699759a01027cc528d0c9 commit f7acb519547e2ccbd19699759a01027cc528d0c9 Author: Mikael Urankar AuthorDate: 2024-02-17 20:22:15 +0000 Commit: Rainer Hurling CommitDate: 2024-02-17 20:34:53 +0000 devel/android-tools: Fix build, include functional While here, pet portlint. PR: 276983 Reported by: Ale MFH: 2024Q1 (cherry picked from commit 6dbc3df04ebbe95dcad623ce76554fb52e26be3d) --- 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 9890ad1ee988..b0a5e4ebfd49 100644 --- a/devel/android-tools/Makefile +++ b/devel/android-tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= android-tools PORTVERSION= 31.0.3p2.0 -PORTREVISION= 14 +PORTREVISION= 15 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 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 + #include ++#include + + #include + #include