From nobody Tue Mar 04 07:42:33 2025 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 4Z6SMF42N0z5plh1; Tue, 04 Mar 2025 07:42:33 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6SMF3CRPz3Fbx; Tue, 04 Mar 2025 07:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741074153; 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=GCnUYZaUy45FgdncXnoHLNq+KYYSI6fQfwbKhloP3vY=; b=b6PF36PKl5PQfZFfBVrKYemGwY9w9Rimha3pqJWq+92s7S+S//dHVSoSurE6rt0r5LDWsV KqHzETwAdkj6L/JNgUj3ZuoGjA6wvFbGTCdMcnfandFkDmdtuSEUr17ZjQL7MAWE4QKPD9 VnN89oiOEv5xGoO09ODSXTkwGIb76mmVAM3NDwJ/E+kSDCJXnpDJpSM7M7X5kSn/l1MprF ccSPNUwkuwpCB5l86YhsJwjK/86SDTwad3Kd0tqssuCdQ+MUnjW/09PFCYbRYPoPbDan1O mLDsDpehVc7dfEjJ1EAB+AeFt78SEvQWUbnzJlW9ejKbyRzjgooSioxhBLxKDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741074153; a=rsa-sha256; cv=none; b=fHpK1ttefYEpYCEi3VNV18DpmIeXu8hYhWm7tTIcXdwV9iNTa2cN5TNWgN3goPatNk8X/N /yy6FaI/llnxn2MpD+dFSSGdY1RPpqSXjLdYlVB+rTmj9Vo8vbMhdThrbue+mmjZHYS0fT oPe6L8H+LxzPq2/orNv8XG8ScrrPtXmS+xDzCsKyniQvu5y2NXWT/NTi1xp+QiN8Hfjwio bQpKhmhZxFsMQbe1MgfCeN6PaRioETwSK+QVcOB40tCEPtoIGi+2ohVKaOCIJlujVkqHWY evy/ZpaaRwcR1v3lvPi5K03pArNoufXgmURars3C0CEc+Z4o7eRk+DTponQm2g== 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=1741074153; 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=GCnUYZaUy45FgdncXnoHLNq+KYYSI6fQfwbKhloP3vY=; b=dYIaDEC5Y1cKZKry+/zg0R/UmB1XyUc3qKZSULCup+cnhckkyQv+6Ci4nh4gyfD+LRlG7X bBU6M0I2vTknGPzKlf65GZjGQfkmkvHxOAPJjMgNLhPD6DLWj0fTui3rvwCDNZdGA/M1TX tGeRG5IsoMeatKFXZ2JInh6hR3VPw4lMim3Bk7pnE26nTin4mBcoQUmJbjvvBA6oJAxG9z 9Dsz/f1DT+MzDIiWgFwi1xjyfkzvYMU4i0/epLkaEdm8a0SMcL9PcNaYpXcW1TWeUMa+DM 8BzK+KgJNEMwXRDgopNgKBNTk5UDHxsTEdoRCbd4yLPzHJaDxE/5/+pBYcytAQ== 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 4Z6SMF2Wqvz1Ngm; Tue, 04 Mar 2025 07:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5247gXEH048363; Tue, 4 Mar 2025 07:42:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5247gXlX048360; Tue, 4 Mar 2025 07:42:33 GMT (envelope-from git) Date: Tue, 4 Mar 2025 07:42:33 GMT Message-Id: <202503040742.5247gXlX048360@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: b1402eab815c - main - misc/py-tflite-support: update depends for absl-py; unbreak for clang 19+ 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1402eab815c782a2f630eac82661c0e85bc87a8 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1402eab815c782a2f630eac82661c0e85bc87a8 commit b1402eab815c782a2f630eac82661c0e85bc87a8 Author: John Hein AuthorDate: 2025-03-04 07:41:35 +0000 Commit: Yuri Victorovich CommitDate: 2025-03-04 07:41:35 +0000 misc/py-tflite-support: update depends for absl-py; unbreak for clang 19+ PR: 284843 --- misc/py-tflite-support/Makefile | 6 ++-- .../files/patch-include_flatbuffers_flatbuffers.h | 34 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/misc/py-tflite-support/Makefile b/misc/py-tflite-support/Makefile index e2bfc0d5c023..79ba00be09ba 100644 --- a/misc/py-tflite-support/Makefile +++ b/misc/py-tflite-support/Makefile @@ -1,6 +1,6 @@ PORTNAME= tflite-support DISTVERSION= 0.1.0a1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc # machine-learning MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,11 +11,9 @@ WWW= https://www.tensorflow.org/ LICENSE= APACHE20 -BROKEN_FreeBSD_15= compilation fails with clang-19, and it isn't clear how to upgrade, see https://github.com/tensorflow/tflite-support/issues/991 - BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>=2.4:devel/py-pybind11@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}absl>=0.7.0:devel/py-absl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}absl-py>=0.7.0:devel/py-absl-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>=2.4:devel/py-pybind11@${PY_FLAVOR} USES= compiler:c++14-lang python diff --git a/misc/py-tflite-support/files/patch-include_flatbuffers_flatbuffers.h b/misc/py-tflite-support/files/patch-include_flatbuffers_flatbuffers.h new file mode 100644 index 000000000000..28c4d34cb2b6 --- /dev/null +++ b/misc/py-tflite-support/files/patch-include_flatbuffers_flatbuffers.h @@ -0,0 +1,34 @@ +'vector_downward &operator=(vector_downward &&other)' wants an rvalue. +other.buf_ is a lvalue. + +Newer clang compilers are stricter about this. +clang++19 and later complain: + +include/flatbuffers/flatbuffers.h:1866:12: error: overload resolution selected deleted operator '=' + 1866 | buf_ = other.buf_; + | ~~~~ ^ ~~~~~~~~~~ + +For this py-tflite-support port, if you comment out TableKeyComparator &operator=(), +it builds. + +Another fix is to convert the lvalue to an rvalue using std::move() +which is not an expensive operation. That also builds with older +or newe clang++. + + +--- include/flatbuffers/flatbuffers.h.orig 2020-03-20 02:52:36 UTC ++++ include/flatbuffers/flatbuffers.h +@@ -1862,10 +1862,12 @@ class FlatBufferBuilder { + vector_downward &buf_; + + private: ++#if 1 + TableKeyComparator &operator=(const TableKeyComparator &other) { +- buf_ = other.buf_; ++ buf_ = std::move(other.buf_); + return *this; + } ++#endif + }; + /// @endcond +