From nobody Fri Dec 01 05:45:39 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 4ShMVD2cZkz53KXB; Fri, 1 Dec 2023 05:45:40 +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 4ShMVD132Mz3XP8; Fri, 1 Dec 2023 05:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701409540; 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=vkQp1ck5Uar5a44MCDX8lWp676hiVMiKMTpUY9kjGAw=; b=E5yidNZZvFpl+8J5Wlg7pM1As4sIUUHtI7pvXRVl+ryyFAZqnaWf1XuqMGXXflwzOlDcyo zKRx5bxz364PPZSlL5IfXiPnt5T1X9bu/4bMBJ2jwXdD/mV1JvF7Qg8mJGoYKvRK0UVEMX dTt5n2vft6MYVrNJwhcRmd4Eax/AE+q+0FQRKD/R67bu7qWHxpYK6VPIf96O6Xv+oDckaJ d6CRQkshW5Q3MWFTg6w5k6TefMfjz4Dc3W8gE5EVpzvRfbwosHF7c6OlnrsusmOvd8DJkN UJkuA9Se7YJ0oa7JCgpJkkkaXgBA+OaZj/g7yosB7nOCKAW21HQXKmL5oL8ODQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701409540; 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=vkQp1ck5Uar5a44MCDX8lWp676hiVMiKMTpUY9kjGAw=; b=i8TFGrdNfBBt2enEjMH4OWHS7UyI+rZZacHhNk5uUlPH9FHpi6ob1Qmxse6lO/i4pKM32p ct+LrNHZv4Gsx+568lDegrOukFsAFZrxSR/HnJ07SV6IyFfO/eKk3889aTra0IblSksCWh Hap5VpA5b7GHFEPTfYpqQonEa33DPYfaNi6qrm3M2HXl3E+xyq6H+8Eza1i+3TsCUx7cXA RRGAeAGuSUUmjzMcbD6QBU0eeuB8fwdpnsiLLmaY46sq4DB3Y9guCD0pI0rz8i5QXj6BNK GM0G4hpoianrDMXtMOJnWSNNBMXByJafj1VJlAi5zCVxEjBb4pH8QS2ePrV1Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701409540; a=rsa-sha256; cv=none; b=vna4/QDrbnymy/MtUmbaV7gP08cb1UjP/dBt5SXfmtUzemLcJn2nLEOl5WJsxTGf6YLygj tcBd8yD/ohq1mD+5i9U8gehdN5A4ocOHvD+IWfX63E3u9eG1u8cbJnikysm7Fyh7KZHy+Y xlte2GBmQeJPAVa3QkaZh9r1jQg/uq7JMkx230BzAzBZlkFogIMWJTeRHRRnbTc74gWY7t UhRt+u7e2vsqYUNUZ7LBRbboSoMAk8zpIuDgKP1cfTsyUhf1jlQ7sDZt2wKl1jZnUmAbXA b9DqQZLapaAHvVA31UqUEqHiB1niFvdb7cDxVkp5Tv63YlCCVphfY+oDBJ7/KA== 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 4ShMVD006Fz6k6; Fri, 1 Dec 2023 05:45:39 +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 3B15jdGa075181; Fri, 1 Dec 2023 05:45:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B15jdBv075178; Fri, 1 Dec 2023 05:45:39 GMT (envelope-from git) Date: Fri, 1 Dec 2023 05:45:39 GMT Message-Id: <202312010545.3B15jdBv075178@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: bbc7f225adae - main - databases/mysql80-server: Fix build 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: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbc7f225adae1c20fa9a4d3e28e544eb51730075 Auto-Submitted: auto-generated The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbc7f225adae1c20fa9a4d3e28e544eb51730075 commit bbc7f225adae1c20fa9a4d3e28e544eb51730075 Author: Jochen Neumeister AuthorDate: 2023-12-01 05:42:15 +0000 Commit: Jochen Neumeister CommitDate: 2023-12-01 05:45:32 +0000 databases/mysql80-server: Fix build Fix aarch64 (1) and i386 (2) build Reported by: fluffy (1) PR: 274918 (2) Martin Birgmeier Sponsored by: Netzkommune GmbH --- databases/mysql80-server/Makefile | 5 +++++ ...st-boost_1_77_0-boost-move-detail-type_traits.hpp | 20 ++++++++++++++++++++ .../files/patch-storage_innobase_include_ut0crc32.h | 12 ++++++++++++ 3 files changed, 37 insertions(+) diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 999ce104ac0a..4fddf2f98986 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -203,6 +203,11 @@ post-extract: EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-scripts_CMakeLists.txt .endif +# XXX MBi alignment issue +.if ${ARCH} == i386 +EXTRA_PATCHES+= files/extra-patch-boost-boost_1_77_0-boost-move-detail-type_traits.hpp +.endif + .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/databases/mysql80-server/files/extra-patch-boost-boost_1_77_0-boost-move-detail-type_traits.hpp b/databases/mysql80-server/files/extra-patch-boost-boost_1_77_0-boost-move-detail-type_traits.hpp new file mode 100644 index 000000000000..6365179f2bc4 --- /dev/null +++ b/databases/mysql80-server/files/extra-patch-boost-boost_1_77_0-boost-move-detail-type_traits.hpp @@ -0,0 +1,20 @@ +--- ./boost/boost_1_77_0/boost/move/detail/type_traits.hpp.ORIG 2021-08-05 11:42:11.000000000 +0200 ++++ ./boost/boost_1_77_0/boost/move/detail/type_traits.hpp 2023-11-04 13:09:44.198320000 +0100 +@@ -1104,7 +1104,7 @@ + typedef int (alignment_dummy::*member_ptr); + typedef int (alignment_dummy::*member_function_ptr)(); + struct alignment_struct +-{ long double dummy[4]; }; ++{ double XXXdummy[4]; }; + + ///////////////////////////// + // max_align_t +@@ -1122,7 +1122,7 @@ + float float_; + double double_; + void * void_ptr_; +- long double long_double_[4]; ++ double XXXlong_double_[4]; + alignment_dummy *unknown_class_ptr_; + function_ptr function_ptr_; + member_function_ptr member_function_ptr_; diff --git a/databases/mysql80-server/files/patch-storage_innobase_include_ut0crc32.h b/databases/mysql80-server/files/patch-storage_innobase_include_ut0crc32.h new file mode 100644 index 000000000000..8ecb999b0221 --- /dev/null +++ b/databases/mysql80-server/files/patch-storage_innobase_include_ut0crc32.h @@ -0,0 +1,12 @@ +--- storage/innobase/include/ut0crc32.h.orig 2023-11-27 21:02:58.728994000 +0100 ++++ storage/innobase/include/ut0crc32.h 2023-11-27 21:04:10.010362000 +0100 +@@ -132,7 +132,9 @@ CRC32_DEFAULT + #endif /* CRC32_ARM64 */ + + #ifdef CRC32_ARM64_DEFAULT ++#ifndef __FreeBSD__ + #include ++#endif /* __FreeBSD__ */ + #include + #endif /* CRC32_ARM64_DEFAULT */ +