From nobody Sat Apr 06 17:26:26 2024 X-Original-To: dev-commits-ports-branches@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 4VBj2C1vv7z5H1jt; Sat, 6 Apr 2024 17:26:27 +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 4VBj2C0jnjz43b7; Sat, 6 Apr 2024 17:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712424387; 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=sWdF41/mgCBmFa+LnzGi0dYoY1J5yNo0APCR/wRr6gc=; b=mki0ECQMxCVpl9Z2JlkPxH7EFu1HDN4l5MoCxMumMogS/zuIv6dVj9RSM4gYOdcZhJY6rR lDfydo30Psrdd227ETdwJNOlVcOeJDnjGHeVsaJGRUnCKqvVhAGN6WL5GZW8SK93cWSmtZ 5XwK02mlguic2NdO+lAsWILySiJeSoUI2EGr8CD2gNrRX+LqveReG1GjKwPeoSsP0srff0 HujWzPWqQNB/huOot1BAOcInemlqV//plEXuCW+PyzADiVx2d+JCzDKrJtpzs1StdTp0wo donfq6HN+i4HrRusRIif1VEdPgGh+uijDMFD6uFPjFRLWUGrP3m7vWeTSTH72A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712424387; a=rsa-sha256; cv=none; b=H7O/hJ6TmGpX/m0szlBmFtZQ2OmTeZo0CX6r67MpJlBIgL7qcMrnLPi+SBWlf5LyxdOMnM VQEVww9WRtdgUA6CEjoqY0crSlmTZim8cAt3y6+4d5YxncYLCyRch5W1lDcAzZVBTZUBwc 5kJVqsaQylIr96Q6utSikoFVQY+qgdlyq1KR6+9iUV6OxRxNgzxavThv31cwi0cSyXMl8Y FhjprkeoVrt8S/tBywYOjmEfRcF9ktFGmkrQZHrnL9FdPryJBBl+tUmtOozqPo9SMZS6SG qmvV1F3P+fHzs89lLqul47Awjg09sKIDCVpwxdc0f2/BXnOrdqCxabjV9RiWXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712424387; 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=sWdF41/mgCBmFa+LnzGi0dYoY1J5yNo0APCR/wRr6gc=; b=DfNj8vMT+WyX67gyxU4L++jJuOBn+IlpO76x4y7VmziHPziKZwFJE4hxq+EJO69dJoMONf f83elyPWkfxQU08ppMIZObqmDP4cCCOw+DyNmOrZ19LKXSU+RCg1Mim65V4z8yK90MPYRY 1gU/iBzs0tgtb33lzLelcAosn8Bk2l34gn9aGVi4/ybpYpYNVT7foOAGKLUjSn1p/zuNEP CSH6fFn13X0k/uDCP4QkDEroi/TR6a36J60+jGzCKn6/UZfLyxE8b3ycZaLFlEpG1hWNwc GWLq0LdEKY969RoLSqbRSUqwn9D23WEGR0jmtAijY+Kx8ZrxHr1cE5/RVcVHBg== 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 4VBj2C0Kp2zsR8; Sat, 6 Apr 2024 17:26:27 +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 436HQQAY041458; Sat, 6 Apr 2024 17:26:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436HQQER041455; Sat, 6 Apr 2024 17:26:26 GMT (envelope-from git) Date: Sat, 6 Apr 2024 17:26:26 GMT Message-Id: <202404061726.436HQQER041455@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: 154a19da2a20 - 2024Q1 - databases/mysql80-server databases/mysql81-server: fix build with libc++ 18 on i386 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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: 154a19da2a20a6f899d7e1e92c1ddc56447a0b00 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=154a19da2a20a6f899d7e1e92c1ddc56447a0b00 commit 154a19da2a20a6f899d7e1e92c1ddc56447a0b00 Author: Dimitry Andric AuthorDate: 2024-03-22 20:49:01 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 17:26:12 +0000 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 Approved by: maintainer timeout (2 weeks) MFH: 2024Q1 (cherry picked from commit b49518c5c7c16418d7da0a5ce786da139b905bb1) --- databases/mysql80-server/Makefile | 1 - databases/mysql81-server/Makefile | 1 - 2 files changed, 2 deletions(-) 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