Skip to content

Commit

Permalink
databases/mysql80-server: Fix build
Browse files Browse the repository at this point in the history
Fix aarch64 (1) and i386 (2) build

Reported by:	fluffy (1)
PR:	274918 (2) Martin Birgmeier <d8zNeCFG@aon.at>

Sponsored by:	Netzkommune GmbH
  • Loading branch information
joneum committed Dec 1, 2023
1 parent 05b3e35 commit bbc7f22
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 0 deletions.
5 changes: 5 additions & 0 deletions databases/mysql80-server/Makefile
Expand Up @@ -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}
Expand Down
@@ -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_;
@@ -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 <asm/hwcap.h>
+#endif /* __FreeBSD__ */
#include <sys/auxv.h>
#endif /* CRC32_ARM64_DEFAULT */

0 comments on commit bbc7f22

Please sign in to comment.