From nobody Sat Apr 06 17:25:35 2024 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 4VBj1D0mCYz5H1mJ; Sat, 6 Apr 2024 17:25:36 +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 4VBj1D05Vtz43p1; Sat, 6 Apr 2024 17:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712424336; 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=22rk/NANFjEHcvykJ/ff641FqKRSHFDeBtbwVVszIIE=; b=v6RimXjLOnoGOCIA6/zW1Hjv/i3vEXVFaFjBsnAFOeXLNRG5xl9FOvH3oTfeHQap40azzs Zda0TRpvyBkdq6qdGxGHKcFjtl+ASNDHzRrCIOgZubdTASmaHiZWJATA+OJD3jqnitL0L5 p6vO4FDJrpoYGdmWuyFIpMACOURKoxm3bYdBlwNsG5LfN3JmxLPepIXWY+LuQxpM5zm9hq ol4fScui/k5+FsaFXMYV6koAj3Omt37KKZhnZFf0lzK/fNx4sRcflU2R4H4Xh41eRQ5cY6 iz1Y6ZVsecA0avyGWoVF2YnE99hs7nMmnEWLS8QYxs51nh9UzSyv3F+3fmnbxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712424336; a=rsa-sha256; cv=none; b=FxNz5IMzTyC93lwMc6fvxW9k3MYoUcJDseI8Bn3utyNtjRB7R6wxiUpXzkMFrQHd5SRcTw r0rS8ViHDHh6CYkjqHP7mLV/uaHhZRagCTw2pzk8ToeAQSCihn0pukvuJAwiZymtaHlbcJ kBFgU1VD/grWTzC9wQywns+cVyKW+QBMpVI49FyS37SPOIjYuF79XQkhwrP1XW7Iqa2mPx efdgg36LeALqP6rU0ouAQcWfQT2LmSQSqFXqevOSRtkK5G2isxwU0qljk4/f2wMxQT1FLM o+A4XTQquldbvTHN8jEF1PUGgV/f6wix8diI8VgF+z8WBIw0Oizi/rkT71rhKw== 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=1712424336; 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=22rk/NANFjEHcvykJ/ff641FqKRSHFDeBtbwVVszIIE=; b=P2XhkO/Q2WZPaMhgGCAjv95K6++RU71GQYqPy12VrGHS26y1jtxCCpy6dbPfdqqdIX0vry vsl5e5/XcfiUwSgWfa47sxEBUK/8mFgDPIekY5sJ9KkYFVHEJFwgepmx7IapZjvzM9h5uo sWmxrFkX3ypydAUIvThc619iRsMVQVXk1aLM10mtVZe3ALVAB9ksQj/paP6eP4V0+saBoZ 66ZDtU5CXQpglWoEk5q0oaEZ6VqY3gm71aoi/FMbubsyNoxHRd7Z+boVVA3DwaqB74AXks VzqmtPYfJJuwNVy7pRys7CIW5nXf5s1CankrOb+4yihh57NG2fBxWzZzQDg9ag== 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 4VBj1C6gJyzsrR; Sat, 6 Apr 2024 17:25:35 +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 436HPZq5041181; Sat, 6 Apr 2024 17:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436HPZ6H041178; Sat, 6 Apr 2024 17:25:35 GMT (envelope-from git) Date: Sat, 6 Apr 2024 17:25:35 GMT Message-Id: <202404061725.436HPZ6H041178@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: b49518c5c7c1 - main - databases/mysql80-server databases/mysql81-server: fix build with libc++ 18 on i386 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b49518c5c7c16418d7da0a5ce786da139b905bb1 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=b49518c5c7c16418d7da0a5ce786da139b905bb1 commit b49518c5c7c16418d7da0a5ce786da139b905bb1 Author: Dimitry Andric AuthorDate: 2024-03-22 20:49:01 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 17:20:52 +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 --- 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