From nobody Thu Dec 14 17:03:24 2023 X-Original-To: dev-commits-ports-main@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 4SrdwD60pXz52kkC; Thu, 14 Dec 2023 17:03:24 +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 4SrdwD4Ywyz3YbX; Thu, 14 Dec 2023 17:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573404; 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=lcelNcvpTvlVthyn+YWPlfQGjg++X0xhWtfi54OJDfU=; b=A0kvwE7fkeaC4o5WZII/8UxRAuEGRu/zblOWR7IBpNwx005iqX3zSBOHSDoEg5h2IryHKX 00tlQ/NPtWAqs3n5/NycEAguMTW5bWZ3fYRSBQeHNeTVQQ36SP0LecoX1xwR8JYFc+bDzI Q791B+N5S2ALvW72D5PHTRt5IZ7QiqrwLOiwYottqre9f3eYNRV4eRuzQRLKhbPmN5wDWf U/OvKBtBEZ4fZ8pUsAHyQLphqiNO/Roh9Ljq7OSV6sb9kPAphAS4mjFM0ePfPm3q+eLdMp tSWY4A90Qkjdw80lPb9HF5DlxjvyVAGC9QtjT9HCgqLDZXYplSpUIHje22EL+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573404; a=rsa-sha256; cv=none; b=xsaIxXuPRBLyI5hYK5dm3cLW60IzjsOUq/GgbzJaxp3fsMXtudIIR6nZyGrnlPJAp9kCc7 yNFHWZUcgGr+cLjQBEB9GFbMfDdYY6MobN22k4QFZbBNBOfrejCEdc7c3v4lI8/FMTvgfw 2WLQi9XzNDtfb3Gx951r2g1/p64DrbsvZ8jGhkYUYJxrBn6OvIZMTG3mE8W2quVZdzXX6j 23rLP5CxnCRhPO+hxizB4DLqi35DiQhHXV27rgbu3yHpRxG78p77ATmLD27oZhSmojJkUU 2W1u/ozDqF62y6g+HitnBRdG5AJUUP2axpw/DEQqrmbjTGWYZT+RXltC4C0Bzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573404; 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=lcelNcvpTvlVthyn+YWPlfQGjg++X0xhWtfi54OJDfU=; b=hQFChmr1GTKQpBjko/c7MPsaXHRx0Id7wQam2kjlOFUNEzxsqQpRb8xcU/D1eQCyWOE81T f1lSEs06puB68Hg0FINP9TYFqQDK4SvIEvRE4PmtPZkkMPvoPr07JX1OHTwcCxR/Xid6dw qcXy5m63a1C4euNqk93W2U/7w3tERDVq1XgCIYBAlPB4tPiYxs6FPMxOHeKYnIzIpjrTF1 7xAMlGi3tPteYTbwmXMs2WHDcIK0TCI2dgpcyrCb6iDFi4XP0WgJ1OGTLUPyGaGXYAKB9c rbDyRTk64MHIYaICki0y58SA82bkfQvoGkb66QwtifiomKApz0CeBSRZ3tWAWA== 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 4SrdwD3gQTzbKB; Thu, 14 Dec 2023 17:03:24 +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 3BEH3O2k016561; Thu, 14 Dec 2023 17:03:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3Os5016557; Thu, 14 Dec 2023 17:03:24 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:24 GMT Message-Id: <202312141703.3BEH3Os5016557@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: cb3185cf9860 - main - devel/android-tools: Fix build with protobuf 22+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb3185cf986089a8cc3f2b1c7bd2b75c220db169 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb3185cf986089a8cc3f2b1c7bd2b75c220db169 commit cb3185cf986089a8cc3f2b1c7bd2b75c220db169 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:26 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:03 +0000 devel/android-tools: Fix build with protobuf 22+ --- devel/android-tools/Makefile | 3 ++- devel/android-tools/files/patch-abseil | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile index f447e07430ca..34635918b5b2 100644 --- a/devel/android-tools/Makefile +++ b/devel/android-tools/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libbrotlicommon.so:archivers/brotli \ libprotobuf.so:devel/protobuf \ libzstd.so:archivers/zstd -USES= cmake go:no_targets perl5 python shebangfix +USES= cmake compiler:c++17-lang go:no_targets localbase:ldflags perl5 python shebangfix USE_GITHUB= yes GH_ACCOUNT= neelchauhan @@ -31,6 +31,7 @@ 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 diff --git a/devel/android-tools/files/patch-abseil b/devel/android-tools/files/patch-abseil new file mode 100644 index 000000000000..be949a6aa119 --- /dev/null +++ b/devel/android-tools/files/patch-abseil @@ -0,0 +1,26 @@ +--- vendor/extras/libjsonpb/parse/jsonpb.cpp.orig 2022-06-10 23:11:16 UTC ++++ vendor/extras/libjsonpb/parse/jsonpb.cpp +@@ -49,9 +49,9 @@ ErrorOr MessageToJsonString(const Message + + if (!status.ok()) { + #if GOOGLE_PROTOBUF_VERSION < 3016000 +- return MakeError(status.error_message().as_string()); ++ return MakeError(std::string(status.error_message())); + #else +- return MakeError(status.message().as_string()); ++ return MakeError(std::string(status.message())); + #endif + } + return ErrorOr(std::move(json)); +@@ -66,9 +66,9 @@ ErrorOr JsonStringToMessage(const std: + auto status = JsonToBinaryString(resolver.get(), GetTypeUrl(*message), content, &binary); + if (!status.ok()) { + #if GOOGLE_PROTOBUF_VERSION < 3016000 +- return MakeError(status.error_message().as_string()); ++ return MakeError(std::string(status.error_message())); + #else +- return MakeError(status.message().as_string()); ++ return MakeError(std::string(status.message())); + #endif + } + if (!message->ParseFromString(binary)) {