Attachment 249417 Details for Bug 277896 – databases/mysql80-server databases/mysql81-server: fix build with libc++ 18 on i386

[patch] databases/mysql80-server databases/mysql81-server: fix build with libc++ 18 on i386

databases__mysql8x-server-fix-libcxx18-build-1.diff (text/plain), 1.88 KB, created by Dimitry Andric on 2024-03-22 20:51:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-03-22 20:51:01 UTC

Size: 1.88 KB

patch

obsolete

>commit fdd685e67353320ac66998ad19161aea9c168f89
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-03-22T21:49:01+01:00
>
>    databases/mysql80-server databases/mysql81-server: fix build with libc++ 18 on i386
>    
>    When building against libc++ 18, several iostream classes now get
>    inlined into C++ binaries for efficiency. But because the mysql ports
>    use -malign-double on non-powerpc architectures, this causes an ABI
>    problem with libc++.so, which has not been built with that flag, at
>    least on i386. This can cause segfaults during the build of the port.
>    
>    If it is not the architecture default, as it is on amd64, -malign-double
>    should not be used without recompiling basically the entire userspace
>    runtime. Quoting the gcc docs:
>    
>    > Warning: if you use the -malign-double switch, structures containing
>    > the above types are aligned differently than the published application
>    > binary interface specifications for the x86-32 and are not binary
>    > compatible with structures in code compiled without that switch.
>    
>    Hence, remove -malign-double from CXXFLAGS for these ports.
>    
>    PR:             277896
>    MFH:            2024Q1
>
>diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
>index 8053ff41f708..a729a8155f68 100644
>--- a/databases/mysql80-server/Makefile
>+++ b/databases/mysql80-server/Makefile
>@@ -189,7 +189,6 @@ SSP_UNSAFE=	yes
> LDFLAGS+=	-latomic
> USES+=		compiler:gcc-c++11-lib
> .else
>-CXXFLAGS+=	-malign-double
> USES+=		compiler:c++17-lang
> .endif
> 
>diff --git a/databases/mysql81-server/Makefile b/databases/mysql81-server/Makefile
>index dc321e3067ea..8e1a1ab072de 100644
>--- a/databases/mysql81-server/Makefile
>+++ b/databases/mysql81-server/Makefile
>@@ -189,7 +189,6 @@ SSP_UNSAFE=	yes
> LDFLAGS+=	-latomic
> USES+=		compiler:gcc-c++11-lib
> .else
>-CXXFLAGS+=	-malign-double
> USES+=		compiler:c++17-lang
> .endif
>

Actions: View | Diff

Attachments on bug 277896: 249417