From nobody Mon Oct 16 06:28:20 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 4S86ch3Hxwz4wyFs; Mon, 16 Oct 2023 06:28:20 +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 4S86ch2qcmz4QpP; Mon, 16 Oct 2023 06:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697437700; 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=jB3TGaVOYMax2EQc6k0iwwNp6RjhS5PqUEU1cwlANG4=; b=pDjngDyHpSxpaaBLQzLct1hndpTwAlAmU/bcspiIb7AGbmuVFUlg6ttpjEYV8yD6QXVpqj hNOvV1eHSieoQVWaRX40IPeXoRbR2csL1j7vmhYTr9bvo8O+NA8cL2zBf545M+esPfl9tx qu2EbFCLr4rdS8taq3acefEmXs+SwjiotWGokhgExun5FhCJOzSZnv23z5a4sd46/Rmu75 qC9ekhurevrr9KVTNZpM6bxdvmSWWDe94FZE0Q9ulC3m9VeNWUxdS9dNN2S4otiz1+rpAW 6ddeeFFbg+Zw35vvJNMAbvyTzpYvbb8pJMy7FUz6a4h075YjbTgUClovx1B4iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697437700; a=rsa-sha256; cv=none; b=e1TjPyCxC5kk7zK+VcFmAvKsRORVv/zvJDYJ70b8TXbVr+o7JGydrB79m71yEPRW+X/8Wp SXPaLhuPRouvo7lxZ4QQQ3Y7poDF5D4fIfUK+NlL/dVhwvcuZpsZOUx3IjfajVJPIhbo+F nqj+2Eh0+p8pZf9CozDrK/dsd5Rkte4kz3svGUJ+t9JXzr3ALnlE2KgAciRnpB7IBElUFY AGZeWMaAyVlKARwgiU+2X34yd6rrLo0dCksgs1SKmZtMsDoVOC0bMxJ4RKVgx43vV/3UHW 5/FDH3yZhibbswGLKIZI7W3iRmvf4ZApY0IE7R13t8DOtDwmD83ZyiNawBLYfA== 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=1697437700; 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=jB3TGaVOYMax2EQc6k0iwwNp6RjhS5PqUEU1cwlANG4=; b=kT2fOPkfzi/Tc9/TGj81dTWEtdqmfD9zG7WJs7ZECrSXLF3/kOItv5E0h8YvRS4FEokbqC yrgOpxIpNqvdfH5QOdZ1jvfZrHDNjwlL/ch5TCSLpkowV1boAozFjPDATDpW4CpUo4/+Bz nr3ZGVPlly8rLZOowjuVjMgT+IDlU+mjSsXxOMtLl0EroVl+z+mMKLk/XVrNodKDoSEz6t 2M/8X8DVfBEOeniIxovh5yjpCpkwan8tW5o7ziC+oZlMfM1fVkSZyTC8/h1RnD1wDoVsuC /43DRS9LA3Vh5ARkv90A/f0J+2QrySo+gaP0mfaMBktQOwNcGAD9a6RyZnwzYw== 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 4S86ch1v6BzVR5; Mon, 16 Oct 2023 06:28:20 +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 39G6SK71070815; Mon, 16 Oct 2023 06:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39G6SKbW070812; Mon, 16 Oct 2023 06:28:20 GMT (envelope-from git) Date: Mon, 16 Oct 2023 06:28:20 GMT Message-Id: <202310160628.39G6SKbW070812@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: 1c1158a52009 - main - databases/mysql80-server: fix build with clang/libc++ 17 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c1158a5200990584a0ec761e3869963ead26adc Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c1158a5200990584a0ec761e3869963ead26adc commit 1c1158a5200990584a0ec761e3869963ead26adc Author: Dimitry Andric AuthorDate: 2023-10-14 13:55:03 +0000 Commit: Dimitry Andric CommitDate: 2023-10-16 06:27:53 +0000 databases/mysql80-server: fix build with clang/libc++ 17 Building databases/mysql80-server with clang and libc++ 17 results in the following errors: In file included from /wrkdirs/usr/ports/databases/mysql80-server/work/mysql-8.0.33/sql/auth/sql_authorization.cc:23: In file included from /wrkdirs/usr/ports/databases/mysql80-server/work/mysql-8.0.33/sql/auth/sql_authorization.h:26: In file included from /usr/include/c++/v1/functional:515: In file included from /usr/include/c++/v1/__algorithm/search.h:23: /usr/include/c++/v1/__utility/pair.h:613:22: error: invalid operands to binary expression ('const Auth_id' and 'const MYSQL_LEX_CSTRING') 613 | return __x.first == __y.first && __x.second == __y.second; | ~~~~~~~~~ ^ ~~~~~~~~~ /usr/include/c++/v1/__algorithm/find.h:34:41: note: in instantiation of function template specialization 'std::__1::operator==' requested here 34 | if (std::__invoke(__proj, *__first) == __value) | ^ /usr/include/c++/v1/__algorithm/find.h:72:21: note: in instantiation of function template specialization 'std::__find_impl, void *> *>>, std::__hash_map_iterator, void *> *>>, std::pair, std::__identity>' requested here 72 | __first, std::__find_impl(std::__unwrap_iter(__first), std::__unwrap_iter(__last), __value, __proj)); | ^ /wrkdirs/usr/ports/databases/mysql80-server/work/mysql-8.0.33/sql/auth/sql_authorization.cc:6591:11: note: in instantiation of function template specialization 'std::find, void *> *>>, std::pair>' requested here 6591 | if (find(role_it, role_end, *it) == role_end) { | ^ [... long list of candidates elided ...] This is because an equality operator for Role_id and LEX_CSTRING is missing. Add such an operator to work around the problem. PR: 274464 Approved by: joneum (maintainer) MFH: 2023Q4 --- .../files/patch-sql_auth_sql__authorization.cc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/databases/mysql80-server/files/patch-sql_auth_sql__authorization.cc b/databases/mysql80-server/files/patch-sql_auth_sql__authorization.cc new file mode 100644 index 000000000000..4d35279882d5 --- /dev/null +++ b/databases/mysql80-server/files/patch-sql_auth_sql__authorization.cc @@ -0,0 +1,13 @@ +--- sql/auth/sql_authorization.cc.orig 2023-03-16 17:22:37 UTC ++++ sql/auth/sql_authorization.cc +@@ -7430,6 +7430,10 @@ bool operator==(const Role_id &a, const std::string &b + return tmp == b; + } + ++bool operator==(const Role_id &a, const LEX_CSTRING &b) { ++ return a == to_string(b); ++} ++ + bool operator==(const std::pair &a, const std::string &b) { + return a.first == b; + }