From nobody Sun Dec 18 17:43:53 2022 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 4NZqvY6wdmz1Gm8C; Sun, 18 Dec 2022 17:43:53 +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 4NZqvY4VYHz4JNd; Sun, 18 Dec 2022 17:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385433; 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=fcfuSnGcKVdjnSmfC8WtPWWTvzUDAy2zIl26zNPF4Zg=; b=ZRK4HgTseH1ac2ZvU9hSAsU/7EIbeP8/Kot+yvpkUjPoYxkjfFquX7PBpIs5S3W3Raw01J mFwaoTRcVrVGk08yxZOjZ9wKDxAzzuBDxwC3uYJlIniZ3ADatUzRDbrZDNLAmvor+WUOXy PwBFEWvH7h//xojQUJG3t68iHs/Jztz3k06z+KU21cblA3XYJQR4UDhWdjSNSFEpXcnR9d BUC/NCTIFwvGGMJzWftRIoHh2A2YooxH53o3iVuPHOMI/h6n6qnVdZtdt6z87iA2XK7s5b sNnHsvxoTFqlTM6hlHj8q+pgXc5FKzkqWFVnpFVm5J+roG97NmebiipBEC9eDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385433; 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=fcfuSnGcKVdjnSmfC8WtPWWTvzUDAy2zIl26zNPF4Zg=; b=Mb1k2KauCQgOI0E3E/kySF3kUMpJRpF18+DcLwt52pgw4N5li7Et3+/4lRHtiV+kB4zK70 DiYhxrH4Gtwyc5u/Jl+1Kn2rtRtXgccuL6VNAcmOHyY7VOSqJuZZv7uSMigZpeCR5BQWlh HI3t+y6BsmDE+DoEtcaZ8vz3SjcuNS99G8HjkALbVTgUeEgYNFrmlo720szq+PK0WoH6y/ W2lG7aBron5VLSSrbEYZrezKjM5/rhYdmBNo8LA2ad7eSlNAePM5ylr2E+eurh6efHivkY 8Kuy79hnIY7SPP/L4h/No8Rp8Hw66vLA8S5I/lh0S1WHt0NsbYx/TS8cG5leuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671385433; a=rsa-sha256; cv=none; b=GcG06WbaRsSv+fgMjyvXf+GoGYwFjtuTipuIbvJVwL+XAsuU8q2BNR563cWF52cJ4vO5Kv ACsfUrav8hnvZvCvI6V0UxYkOrGAGS/24xrFNReRiZ1nCcPqsnJODnnsQ1QBhy0J5nvO1A W9anUjV/Y/YbMu0EeaJidXX+1wRdnPUB4tjWIYN0t2WnUtW8tYmlsquNHm5z2iy1kjuPFT WHgiszgMzI0ukqnGcCfTtCOLVGOXhtlfFBcOaOT7IhYbG8O/kVMj9cPeKE65tvrrGSXCG+ Tl/MAwBDSsQ5Yo7y2EMql6zSYJy8gqiG1oy4jhlJoBqgOdlmGY3sqTDe1dryGg== 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 4NZqvY3VDTzPtS; Sun, 18 Dec 2022 17:43:53 +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 2BIHhrs6006519; Sun, 18 Dec 2022 17:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BIHhrUe006518; Sun, 18 Dec 2022 17:43:53 GMT (envelope-from git) Date: Sun, 18 Dec 2022 17:43:53 GMT Message-Id: <202212181743.2BIHhrUe006518@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: 6c83371d6492 - main - databases/mysql57-server: fix build with clang 15 on i386 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: 6c83371d649205efdcf47fcbc4aea1f24ee148fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=6c83371d649205efdcf47fcbc4aea1f24ee148fe commit 6c83371d649205efdcf47fcbc4aea1f24ee148fe Author: Dimitry Andric AuthorDate: 2022-12-12 20:02:40 +0000 Commit: Dimitry Andric CommitDate: 2022-12-18 17:35:44 +0000 databases/mysql57-server: fix build with clang 15 on i386 During an exp-run for llvm 15 (see bug 265425), it turned out that databases/mysql57-server failed to build with clang 15, on i386: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/rapid/plugin/x/src/xpl_plugin.cc:30: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/rapid/plugin/x/src/xpl_session.h:31: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/rapid/plugin/x/ngs/include/ngs/client_session.h:30: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h:31: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/rapid/plugin/x/ngs/include/ngs/protocol/page_pool.h:34: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/rapid/plugin/x/ngs/include/ngs_common/atomic.h:29: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/boost/boost_1_59_0/boost/atomic.hpp:12: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/boost/boost_1_59_0/boost/atomic/atomic.hpp:20: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/boost/boost_1_59_0/boost/atomic/fences.hpp:21: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/boost/boost_1_59_0/boost/atomic/detail/operations.hpp:17: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/boost/boost_1_59_0/boost/atomic/detail/operations_lockfree.hpp:21: In file included from /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/boost/boost_1_59_0/boost/atomic/detail/ops_gcc_atomic.hpp:23: /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/boost/boost_1_59_0/boost/atomic/detail/ops_gcc_x86_dcas.hpp:147:21: error: address argument to atomic builtin cannot be const-qualified ('const volatile boost::atomics::detail::gcc_dcas_x86::storage_type *' (aka 'const volatile long long *') invalid) value = __sync_val_compare_and_swap(&storage, (storage_type)0, (storage_type)0); ^ ~~~~~~~~ /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/boost/boost_1_59_0/boost/atomic/detail/atomic_template.hpp:110:54: note: in instantiation of member function 'boost::atomics::detail::gcc_dcas_x86::load' requested here return static_cast< value_type >(operations::load(m_storage, order)); ^ /wrkdirs/usr/ports/databases/mysql57-server/work/mysql-5.7.40/rapid/plugin/x/src/xpl_common_status_variables.h:43:57: note: in instantiation of member function 'boost::atomics::detail::base_atomic::load' requested here void operator=(const Variable& other) { store(other.load()); } ^ This is because mysql has an old embedded copy of boost, which assumes clang needs a workaround to allocate eax:edx register pairs in inline assembly. Since this is no longer true with recent versions of clang, patch out the clang checks and use the generic inline assembly code. PR: 268339 Approved by: portmgr (tcberner) MFH: 2022Q4 --- databases/mysql57-server/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 8a897ea7647b..0b643f907a0c 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -164,6 +164,8 @@ post-patch: # issue 220865: MySQL developers forgot that FreeBSD != Linux @${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \ ${WRKSRC}/configure.cmake + @${REINPLACE_CMD} -e 's|__clang__|__undefined__|g' \ + ${WRKSRC}/boost/boost_1_59_0/boost/atomic/detail/ops_gcc_x86_dcas.hpp .if !defined(CLIENT_ONLY) post-install: