From nobody Thu Feb 1 19:06:22 2024 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 4TQpKV6xgxz58Rmp; Thu, 1 Feb 2024 19:06:22 +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 4TQpKV61rwz4Hnm; Thu, 1 Feb 2024 19:06:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706814382; 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=CwO4/FQM6UfUT+qkSaRj343BkXjMft6prpCG8hNV9bY=; b=AtNkIP1sdhvFcBjqnRx9vuXx95IQoZfhTqujzS2XdPAo0+/I7g6hKaMyqU3F/gjlMsA2FD jnYUgLeaQqcolK0Gy3Qfxqdd7xJjhPAmdN4DmL5vUHRWUOXk/f8ZMDB+3IFbFnHPqtY4Zm Wo67Fki4v5EzcX+V+WHTBASTwkLcmyYpxkM2AhwyVqWERyMBgro1iggBJs6UJ6ML9az0AG CcWtYz1OGx+XAIErnREfP4iRzUF0gxDSy+FgbjVHz3UX/V48f0/EWjwWvSGfokAv+04bY+ BO2Yi77NcvaJM9z45rOAyZil8YhzPvpMlJU+jmeESOhcXQS4eBGXiYZZiLQDjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706814382; 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=CwO4/FQM6UfUT+qkSaRj343BkXjMft6prpCG8hNV9bY=; b=nkoRFm+FuV57wFrIR/QwWW8lmi+q2XosJu04sTbwxK0m+6ChI9hdHJtGbkL8DsmCPwpyAT eDV50qkDUASCwMZPMvXEWZYM8imInrle15YkpmTceRSReK3Q3lVpBYh/qpPcWTNNG5Qeo3 H4CSyYD0QE0JbvTrERIs4h3tXs4I4gg8coTf9iRasjhBPY2Nudx2bFNZ7d4wAPKAofxzrW OB+NNmn7xlsoAjWAVEyIcHvx1P7ADLXLbkxk2acLs04bqf3Q3ZFHFWREMRW+2ip8B7OO/o 5M7qov4HrhOGpZWS4ypdl9tb4RoGAwN1qcAkKYuZ0PHymS7omYGbK5l2BpV7KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706814382; a=rsa-sha256; cv=none; b=T80bVPc707dV++5VA4klqLTW+h+6h3TiuJYH+ylELEkZMAaTfnJFJGqndrh8NZwYNOB7DZ ZQfKqHzl/Q6Tk6bl88nMNdhrS+tVteoULcbXQTirw1IIHRTiXM69LWwOxcpNmLNCy7PWPw rPAtIEa0njcEk/lNVNRxpMGlIKzDaXCqov+7ep/Se0c0j0ulkbnA91iK1XttSQpSzVcpVz JQZ9D+PUkAweMBn4IXMU5BWkZxBNe7ikffAT4lzj6fQj9lehPtLW7q67P1q2kPxIQf/nSK 7XYwiV04PXTQxVxM06QF+7Vj3V4z8j+qvkWmRko6hPDfBquQgPqcIzuDBygzrA== 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 4TQpKV54QRz1DNS; Thu, 1 Feb 2024 19:06:22 +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 411J6Moh034978; Thu, 1 Feb 2024 19:06:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411J6M0Q034975; Thu, 1 Feb 2024 19:06:22 GMT (envelope-from git) Date: Thu, 1 Feb 2024 19:06:22 GMT Message-Id: <202402011906.411J6M0Q034975@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: c64e355e6226 - 2024Q1 - databases/mysql80-server: fix build with clang 16 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: c64e355e6226d1dd403874a0bc73ada0f13f8ca3 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=c64e355e6226d1dd403874a0bc73ada0f13f8ca3 commit c64e355e6226d1dd403874a0bc73ada0f13f8ca3 Author: Dimitry Andric AuthorDate: 2024-01-16 11:45:17 +0000 Commit: Dimitry Andric CommitDate: 2024-02-01 19:06:06 +0000 databases/mysql80-server: fix build with clang 16 Similar to bug 272295, building databases/mysql80-server with clang 16 or higher can result in an error: /wrkdirs/usr/ports/databases/mysql80-server/work/mysql-8.0.35/boost/boost_1_77_0/boost/mpl/aux_/integral_wrapper.hpp:73:31: error: integer value -1 is outside the valid range of values [0, 3] for the enumeration type 'udt_builtin_mixture_enum' [-Wenum-constexpr-conversion] 73 | typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (value - 1)) ) prior; | ^ /wrkdirs/usr/ports/databases/mysql80-server/work/mysql-8.0.35/boost/boost_1_77_0/boost/mpl/aux_/static_cast.hpp:24:47: note: expanded from macro 'BOOST_MPL_AUX_STATIC_CAST' 24 | # define BOOST_MPL_AUX_STATIC_CAST(T, expr) static_cast(expr) | ^ This is because the vendored copy of boost in mysql80-server is using undefined behavior in a possibly constexpr context. Fix this by unconditionally enabling the "boost workaround" for aux wrapper value types in integral_wrapper.hpp. PR: 276749 Approved by: joneum (maintainer) MFH: 2024Q1 (cherry picked from commit bfdc368a6edddc2c8c305e60dd89c96d7ecb7fc2) --- databases/mysql80-server/Makefile | 2 +- ...oost_boost__1__77__0_boost_mpl_aux___integral__wrapper.hpp | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index e4bd7f2a9758..8053ff41f708 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mysql PORTVERSION= 8.0.35 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server diff --git a/databases/mysql80-server/files/patch-boost_boost__1__77__0_boost_mpl_aux___integral__wrapper.hpp b/databases/mysql80-server/files/patch-boost_boost__1__77__0_boost_mpl_aux___integral__wrapper.hpp new file mode 100644 index 000000000000..66c430a4346f --- /dev/null +++ b/databases/mysql80-server/files/patch-boost_boost__1__77__0_boost_mpl_aux___integral__wrapper.hpp @@ -0,0 +1,11 @@ +--- boost/boost_1_77_0/boost/mpl/aux_/integral_wrapper.hpp.orig 2021-08-05 09:42:13 UTC ++++ boost/boost_1_77_0/boost/mpl/aux_/integral_wrapper.hpp +@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME + // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC), + // while some other don't like 'value + 1' (Borland), and some don't like + // either +-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) ++#if 1 //BOOST_WORKAROUND(__EDG_VERSION__, <= 243) + private: + BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1))); + BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));