From nobody Sun Jan 19 18:33:11 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 4YbhtH1zH9z5lYhF; Sun, 19 Jan 2025 18:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YbhtH1QKLz3vpL; Sun, 19 Jan 2025 18:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737311591; 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=HEZRs7NEcf/09QaNUyOPLJDeSW/0U6rblpoZA3s+gyI=; b=Qshiox5D5Sh0PvqN721WRHwf9t6uB4knOzhgO2AQB7jrnBOtOMWmmf2m7E5o2KC8lOFQTv iNOXiiw90uYzS6zx57rc/0X/waAE9e2rcoD014LxLwcBzXqz8o5uxFwleZKIxQ9uTi3zpW C7gjPQWKztD44g9Ow7uCvs9Ln6VC1zByYsW4ZKXVKWZRnJQBcsbVx9BIV+PpXSkT1BgOHM ygJjKfPptWeEQRIeESZSxTynCtxc+x/YN3OJJvttthjr2Qu+Y6rsGnmTyuqTGjCAH+CrdC VrF1TBMbD/+mRflidqIkj+Y28lPRB6RvGOsCC4iCbSKhfIGdTuUm6DV3uhjKQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737311591; 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=HEZRs7NEcf/09QaNUyOPLJDeSW/0U6rblpoZA3s+gyI=; b=cl0e67XWc3t2WB9dJFzyKAbb3s8KJBPjj8n9btHIY2BLe8e8L4OjYvwyqSuYv+gfSbJoTu Yy5c9PyleTV5A640MgjTB9tlf3RBgMrjQ9fJQIqvG8H6tJ8rj3YPOwlFZKtdRluWCD+PPC p5D2fMZq8hwdPJXZ5/oSaTLMyfjbkPN5wVl4+UX1cJt+67c9ojEI4zBBzfpKKrWzHZ6W4V au1TxExkvm+Rjv1xq5PSxf5bvKs+4V0Ml3+05EZeqfaycxe3Js3QWu1WY65e/Wcy6gsLpz e5jWMj64CkesJY/oyi7wqJ+YT+8jctXawYP9iSLN+bssbLsereTvRddkqL59eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737311591; a=rsa-sha256; cv=none; b=tMoiv4Gh6/PDXvkp3hIpJ39yMmEQCphSmy/ITJQqn8b0FX53apZV0wQTHJpXtIUnycVVpg HvqV6yydd2prRfvQZKlUa8BCQa5f6F/X9PjMPki1pSF1xojk6hZNFoNFgWne70zTgUlnwT gtMBAi18fPGMddAfZiInlWaLJNh7XXLTjUM6IJKccTuIfOA3XStC0+te9Dd5wgounhrijo BOp1VtJA5EjindaXtVSxJ1jVahsC8YW8BPy0k2dPIxPBklwoCDkG6OuF+5oGYm3AnrswqR 8spitmjoBFIGYOITE+F0GMvmR1K1HV6IPjXP8SCdsgA5Qdit42eioQ5iBDA+hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YbhtH11xBz11sM; Sun, 19 Jan 2025 18:33:11 +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 50JIXBeh065276; Sun, 19 Jan 2025 18:33:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50JIXBBe065273; Sun, 19 Jan 2025 18:33:11 GMT (envelope-from git) Date: Sun, 19 Jan 2025 18:33:11 GMT Message-Id: <202501191833.50JIXBBe065273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 6e2222799ebf - main - math/linbox: fix build with 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e2222799ebf6ff0a12bed3798fc0cc0e71e1e55 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e2222799ebf6ff0a12bed3798fc0cc0e71e1e55 commit 6e2222799ebf6ff0a12bed3798fc0cc0e71e1e55 Author: Dimitry Andric AuthorDate: 2025-01-19 18:31:50 +0000 Commit: Dimitry Andric CommitDate: 2025-01-19 18:31:50 +0000 math/linbox: fix build with clang 19 Clang 19 has become more strict about errors in member functions, which results in errors building math/linbox: ../../linbox/vector/blas-subvector.h:121:20: error: no member named 'data' in 'BlasSubvector<_Vector>' 121 | _ptr(V.data()+beg), _size(dim), _inc(inc), _field(&V.field()) {} | ~ ^ ../../linbox/matrix/sparsematrix/sparse-ell-matrix.h:1216:16: error: cannot assign to non-static data member '_ld' with const-qualified type 'const size_t &' (aka 'const unsigned long &') 1216 | _ld = iter._ld ; | ~~~ ^ ../../linbox/matrix/sparsematrix/sparse-ellr-matrix.h:1108:12: error: no viable overloaded '=' 1108 | _rowid = iter._rowid; | ~~~~~~ ^ ~~~~~~~~~~~ In all these cases, the methods where the errors occur are not actually used, so until upstream sorts out their incorrect code, stub them out using #if 0/#endif pairs. PR: 284159 Approved by: thierry (maintainer) MFH: 2025Q1 --- math/linbox/Makefile | 9 +----- ...-linbox_matrix_sparsematrix_sparse-ell-matrix.h | 18 ++++++++++++ ...linbox_matrix_sparsematrix_sparse-ellr-matrix.h | 34 ++++++++++++++++++++++ .../files/patch-linbox_vector_blas-subvector.h | 13 +++++++++ 4 files changed, 66 insertions(+), 8 deletions(-) diff --git a/math/linbox/Makefile b/math/linbox/Makefile index f79cc74daa92..e47c8c2df1aa 100644 --- a/math/linbox/Makefile +++ b/math/linbox/Makefile @@ -68,11 +68,4 @@ CONFIGURE_ARGS+=--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3 \ --disable-avx --disable-avx2 .endif -.include - -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 180 -# See https://github.com/linbox-team/linbox/issues/320 -BROKEN= compilation errors with clang19 -.endif - -.include +.include diff --git a/math/linbox/files/patch-linbox_matrix_sparsematrix_sparse-ell-matrix.h b/math/linbox/files/patch-linbox_matrix_sparsematrix_sparse-ell-matrix.h new file mode 100644 index 000000000000..efde096e0e7e --- /dev/null +++ b/math/linbox/files/patch-linbox_matrix_sparsematrix_sparse-ell-matrix.h @@ -0,0 +1,18 @@ +--- linbox/matrix/sparsematrix/sparse-ell-matrix.h.orig 2021-12-14 10:16:03 UTC ++++ linbox/matrix/sparsematrix/sparse-ell-matrix.h +@@ -1205,6 +1205,7 @@ namespace LinBox + , _row(iter._row) + {} + ++#if 0 + _IndexedIterator &operator = (const _IndexedIterator &iter) + { + _colid_beg = iter._colid_beg ; +@@ -1218,6 +1219,7 @@ namespace LinBox + + return *this; + } ++#endif + + bool operator == (const _IndexedIterator &i) const + { diff --git a/math/linbox/files/patch-linbox_matrix_sparsematrix_sparse-ellr-matrix.h b/math/linbox/files/patch-linbox_matrix_sparsematrix_sparse-ellr-matrix.h new file mode 100644 index 000000000000..bd8b3eaf95c8 --- /dev/null +++ b/math/linbox/files/patch-linbox_matrix_sparsematrix_sparse-ellr-matrix.h @@ -0,0 +1,34 @@ +--- linbox/matrix/sparsematrix/sparse-ellr-matrix.h.orig 2021-12-14 10:16:03 UTC ++++ linbox/matrix/sparsematrix/sparse-ellr-matrix.h +@@ -1099,6 +1099,7 @@ namespace LinBox + + {} + ++#if 0 + _Iterator &operator = (const _Iterator &iter) + { + _data_it = iter._data_it ; +@@ -1111,6 +1112,7 @@ namespace LinBox + + return *this; + } ++#endif + + bool operator == (const _Iterator &i) const + { +@@ -1246,6 +1248,7 @@ namespace LinBox + , _row(iter._row) + {} + ++#if 0 + _IndexedIterator &operator = (const _IndexedIterator &iter) + { + _rowid_it = iter._rowid_it ; +@@ -1260,6 +1263,7 @@ namespace LinBox + + return *this; + } ++#endif + + bool operator == (const _IndexedIterator &i) const + { diff --git a/math/linbox/files/patch-linbox_vector_blas-subvector.h b/math/linbox/files/patch-linbox_vector_blas-subvector.h new file mode 100644 index 000000000000..00c6e129b8aa --- /dev/null +++ b/math/linbox/files/patch-linbox_vector_blas-subvector.h @@ -0,0 +1,13 @@ +--- linbox/vector/blas-subvector.h.orig 2021-12-14 10:16:03 UTC ++++ linbox/vector/blas-subvector.h +@@ -117,8 +117,10 @@ namespace LinBox { + * \param dim dimension + * \param inc distance between two element + */ ++#if 0 + BlasSubvector (Self_t &V, size_t beg, size_t inc, size_t dim) : + _ptr(V.data()+beg), _size(dim), _inc(inc), _field(&V.field()) {} ++#endif + + + /** Constructor from an existing @ref BlasVector