From nobody Mon Feb 28 12:54:10 2022 X-Original-To: dev-commits-ports-all@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 2F19819F86C4; Mon, 28 Feb 2022 12:54:11 +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 4K6gLV4y3pz3l1m; Mon, 28 Feb 2022 12:54:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052850; 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=OAGKGgDxkDJtssSZLkwH/6ZAWQW4csTFrnss7grFVeM=; b=K9ujMALLqF9hl8Ic6RtDrU8w+wMoeODB5e24t+WGq0lOH9ISNP4orAXFLiS1BpsFR/RBuE 0iNeltJeX8R9opp/MVQqusIbT0duVdzdjLhtP9QN75Rs7POThyd3Tn/BrY2ks+cc/+onYh Zu5Pb7gXnZJp2hKjD2ZknhzjU5RWsSErBPJVxQSB0Ik5eRgMlhcysJbVLIyeQW374aozus E3yh/LNhuv6xP2yfJLhRJ4cJnR5BIxbl3iU3WM7OLwiJv+MJ2Hzw9WSDJjPVIU1D1Px+sK UADsTZHbR5qFFQdEXzu3EGKjbYpHP6KjdlwiHbr62aP1ujkVRHlCYt/taoeMHg== 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 6627C1B9AB; Mon, 28 Feb 2022 12:54:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21SCsA1E067755; Mon, 28 Feb 2022 12:54:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SCsAiO067754; Mon, 28 Feb 2022 12:54:10 GMT (envelope-from git) Date: Mon, 28 Feb 2022 12:54:10 GMT Message-Id: <202202281254.21SCsAiO067754@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: 05055b1fb512 - main - misc/mnn: Fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 05055b1fb51278a661015d2203038be8e7ca79a9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052850; 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=OAGKGgDxkDJtssSZLkwH/6ZAWQW4csTFrnss7grFVeM=; b=dzD99IgABdBBIpXKkGhXBQD4Ghqc8XnSNpia2qsbQWr39aabuJcd2vmQUBS85vnh+YTAl9 Je1ex5FMKHUOTOhQixTnOT1nAboWjKWEcsV79p6gBcKDYh7I2H6tcZKDgqDI93l4rZaDqj mbgMhR7a8kGMAvh/CxYyk8uxNkOxwd2ftHSMQcK4mOTJWmmq7XtTT668uQqORq0EMNmnHF zZX2qKXzffW4WSkwwzBGYGvVXxDyzHst3NYWhHf10QpZRhCW9pz4Rf75Py1uyjlVMr+GjJ mdrwGySWUtayNr11J6k171Y6yoea7HhcTgwBgaeVmlS2MJ11xkg+vNxfyxqmTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646052850; a=rsa-sha256; cv=none; b=VbSsToPrE5R9KlwsIIqujJftQgaos2p/nG3O3lM3ID71Y7lE0QmjUg60i+V1jYy2pL44Og NGbSDPYEgZ224D/Yc3zPbVnuEckDtW9kDua3Qt6c0pVVjd2t+AiwlDHovtP6Qkdb93q7Gh URBKlLM0aZsTUG/ONlEMNPbGhs8pP6d0UA3vHo/X4qwbJwKk+y0/h6zCVCRXNzS+M8Zw/w 0tTXo9/foMXPPa3aP+0lymqAIXOZ6tZ/jgxOFBcla0Hk+aZYHHzRdpbvI7oeWMCHy4OdlF 9X3sEO0Hxd9OGPBKmqksKBPi5o2sQcWMDdS2UVECIPWc7klPZoOxrhUM0ImFng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=05055b1fb51278a661015d2203038be8e7ca79a9 commit 05055b1fb51278a661015d2203038be8e7ca79a9 Author: Po-Chuan Hsieh AuthorDate: 2022-02-28 09:43:13 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-02-28 12:46:45 +0000 misc/mnn: Fix build FAILED: tools/converter/CMakeFiles/MNNConvertDeps.dir/__/__/3rd_party/flatbuffers/src/util.cpp.o /usr/local/libexec/ccache/c++ -DGOOGLE_PROTOBUF_NO_RTTI -DMNNConvertDeps_EXPORTS -DMNN_SUPPORT_TFLITE_QUAN -DMNN_USE_THREAD_POOL -DMNN_VERSION=\"0.2.1.5git\" -DMNN_VERSION_MAJOR=0 -DMNN_VERSION_MINOR=2 -DMNN_VERSION_PATCH=1 -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/include -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/source -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/express -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/tools -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/codegen -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/schema/current -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/half -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/imageHelper -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/OpenCLHeaders -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/tools/converter/include -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/tools/converter/source/tflite/schema -I/wrkdirs/usr/ports/misc/mnn/work/.build/tool s/converter -O2 -pipe -fPIC -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -pthread -fPIC -isystem /usr/local/include -std=c++11 -O3 -fvisibility-inlines-hidden -fvisibility=hidden -fomit-frame-pointer -fstrict-aliasing -ffunction-sections -fdata-sections -ffast-math -fno-rtti -fno-exceptions -O2 -pipe -fPIC -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -pthread -fPIC -isystem /usr/local/include -fPIC -std=gnu++11 -MD -MT tools/converter/CMakeFiles/MNNConvertDeps.dir/__/__/3rd_party/flatbuffers/src/util.cpp.o -MF tools/converter/CMakeFiles/MNNConvertDeps.dir/__/__/3rd_party/flatbuffers/src/util.cpp.o.d -o tools/converter/CMakeFiles/MNNConvertDeps.dir/__/__/3rd_party/flatbuffers/src/util.cpp.o -c /wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/flatbuffers/src/util.cpp /wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/flatbuffers/src/util.cpp:150:37: error: use of undeclared identifier 'string_back' char &filepath_last_character = string_back(filepath); ^ /wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/flatbuffers/src/util.cpp:227:18: error: use of undeclared identifier 'string_back' (ch == string_back(s))) ^ 2 errors generated. Approved by: portmgr (blanket) --- .../patch-3rd__party_flatbuffers_src_util.cpp | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/misc/mnn/files/patch-3rd__party_flatbuffers_src_util.cpp b/misc/mnn/files/patch-3rd__party_flatbuffers_src_util.cpp new file mode 100644 index 000000000000..df5ac3619a2b --- /dev/null +++ b/misc/mnn/files/patch-3rd__party_flatbuffers_src_util.cpp @@ -0,0 +1,32 @@ +Reference: https://github.com/google/flatbuffers/commit/6748c373be9ef54e221265a502a3cee3bbf8cef1 + +FAILED: tools/converter/CMakeFiles/MNNConvertDeps.dir/__/__/3rd_party/flatbuffers/src/util.cpp.o +/usr/local/libexec/ccache/c++ -DGOOGLE_PROTOBUF_NO_RTTI -DMNNConvertDeps_EXPORTS -DMNN_SUPPORT_TFLITE_QUAN -DMNN_USE_THREAD_POOL -DMNN_VERSION=\"0.2.1.5git\" -DMNN_VERSION_MAJOR=0 -DMNN_VERSION_MINOR=2 -DMNN_VERSION_PATCH=1 -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/include -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/source -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/express -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/tools -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/codegen -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/schema/current -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/half -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/imageHelper -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/OpenCLHeaders -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/tools/converter/include -I/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/tools/converter/source/tflite/schema -I/wrkdirs/usr/ports/misc/mnn/work/.build/tools/c onverter -O2 -pipe -fPIC -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -pthread -fPIC -isystem /usr/local/include -std=c++11 -O3 -fvisibility-inlines-hidden -fvisibility=hidden -fomit-frame-pointer -fstrict-aliasing -ffunction-sections -fdata-sections -ffast-math -fno-rtti -fno-exceptions -O2 -pipe -fPIC -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -pthread -fPIC -isystem /usr/local/include -fPIC -std=gnu++11 -MD -MT tools/converter/CMakeFiles/MNNConvertDeps.dir/__/__/3rd_party/flatbuffers/src/util.cpp.o -MF tools/converter/CMakeFiles/MNNConvertDeps.dir/__/__/3rd_party/flatbuffers/src/util.cpp.o.d -o tools/converter/CMakeFiles/MNNConvertDeps.dir/__/__/3rd_party/flatbuffers/src/util.cpp.o -c /wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/flatbuffers/src/util.cpp +/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/flatbuffers/src/util.cpp:150:37: error: use of undeclared identifier 'string_back' + char &filepath_last_character = string_back(filepath); + ^ +/wrkdirs/usr/ports/misc/mnn/work/MNN-1.2.0/3rd_party/flatbuffers/src/util.cpp:227:18: error: use of undeclared identifier 'string_back' + (ch == string_back(s))) + ^ +2 errors generated. + +--- 3rd_party/flatbuffers/src/util.cpp.orig 2021-06-11 09:17:13 UTC ++++ 3rd_party/flatbuffers/src/util.cpp +@@ -147,7 +147,7 @@ std::string ConCatPathFileName(const std::string &path + const std::string &filename) { + std::string filepath = path; + if (filepath.length()) { +- char &filepath_last_character = string_back(filepath); ++ char &filepath_last_character = filepath.back(); + if (filepath_last_character == kPathSeparatorWindows) { + filepath_last_character = kPathSeparator; + } else if (filepath_last_character != kPathSeparator) { +@@ -224,7 +224,7 @@ ClassicLocale ClassicLocale::instance_; + std::string RemoveStringQuotes(const std::string &s) { + auto ch = *s.c_str(); + return ((s.size() >= 2) && (ch == '\"' || ch == '\'') && +- (ch == string_back(s))) ++ (ch == s.back())) + ? s.substr(1, s.length() - 2) + : s; + }