From nobody Thu Mar 2 18:43:32 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 4PSKkD72S6z3w7Ss; Thu, 2 Mar 2023 18:43:32 +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 4PSKkD6Qzsz3hcx; Thu, 2 Mar 2023 18:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677782612; 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=xxueb3mmF6TwbudSTO7+hLzaA2r3JblFSUFDPD/JzJE=; b=BiTRz1LNOzmK8JbYNas3gw/G4XTJneSZZMsKoo/dO6Xq9vRJ1tsMAAtxJBscrJDwP7YMmJ +rLi6V67gdrxwYLxqF1H3mDWNfSJ0LOpCJG5ud4Ym1ieNClfCvdM2TlFFAKc0ZWx+npTDL 5v5eFJnhX7/HJ8XZTgVWNMQlfzw/RdGL8NgnHQmqP8ioMqfnYWpCFJMFU2tL0v9w3d5dns I/dShdEd9AGO8YDf6gapNNmXpHIU7OusDMco7fIw0AIUofUAhv97/MIPJrz5YOEQeON+Yd 2B862bk6Om9jyKFgbF4RoRboSTuXJh15IdGpGRmwpquccqGDp2/dglnBWHsiKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677782612; 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=xxueb3mmF6TwbudSTO7+hLzaA2r3JblFSUFDPD/JzJE=; b=jPhvoTdOA3qIQBX9reoUU1QcWU8p4wZKeiQse1WO4Fbh41nqn5L23kH9eUWViogqijw4s4 Gri4/JYjZSTooC5Tj0gv/4vxMbAUoelzioN+2iRWIf4Qx389e/G3XgNmrTYDNrzF501Ztk 1g9ZJ13+YJrrg9F6sjg9VgD1qFcxLWpS6kekZbjddpAaxVwLLlbWEIPz0glw2RWJJNnS7v kdFzKf4a1lIG/rL1vZGnik4KAVDCA2vc9d4fXReoZVV1rMVlyOLycclP2o63BsqJpcQKH+ ne/NqmzSAs6SpcVDzkkXCFvqkdX8WjEE5QLuspvuaQUX6+lkGUo605xcm1U4Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677782612; a=rsa-sha256; cv=none; b=Qn5fulQrnMNedlVBD+DX1gk4zw99eayNKpgD9R8RUxj8r7d+LkCHZSsZ0VoqzyJWeu4yUx wVuftCazIFjqKbnAn+GoY9d3OlyBFpchZePa/v21KsSM+3T/aRssj1sMTbdO6NLSJgXSVd KhkzuBdfBBiQrCTkX3ShzgSZJs6JzOqtnLDxDfZVc6tuiPWeyOtzZnERrvO0imH8ilYS5R rQN/TlUrmFdm7oQTHi097iIeT6XcJ33oqbcB6rOgUkkUXF/u7ZXr4IEluMQz7BWZRIFwEr ekyCR6Vxh73KT83zvyyOei8o/CVCrqXyNTDuzda4RmN2Nk9Hdw6RSZyqXN11yw== 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 4PSKkD5VGXzS3d; Thu, 2 Mar 2023 18:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 322IhWaV083546; Thu, 2 Mar 2023 18:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IhWC1083545; Thu, 2 Mar 2023 18:43:32 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:43:32 GMT Message-Id: <202303021843.322IhWC1083545@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: ba9f8de67ed9 - main - databases/mysql80-server: fix build of client on powerpc 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba9f8de67ed96731d4b6f6e9c73df056793a9e0c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba9f8de67ed96731d4b6f6e9c73df056793a9e0c commit ba9f8de67ed96731d4b6f6e9c73df056793a9e0c Author: Piotr Kubaj AuthorDate: 2023-03-02 18:43:16 +0000 Commit: Piotr Kubaj CommitDate: 2023-03-02 18:43:16 +0000 databases/mysql80-server: fix build of client on powerpc On powerpc, clang miscompiles comp_err, which later fails at runtime with: -> 0x102ff48c <+16>: .long 0x0006ee74 ; unknown opcode The problem happens because of line: frame #0: 0x10323eb4 comp_err`set_my_errno(my_errno=-10608) at my_thr_init.cc:344:47 GCC can compile client, but without -malign-double. It also needs to link to libatomic (so building without GCC installed wouldn't work anyway). This only fixes client. Server still fails to build because of: /wrkdirs/usr/ports/databases/mysql80-server/work/mysql-8.0.32/storage/innobase/include/log0sys.h:190:60: error: static assertion failed 190 | static_assert(decltype(write_to_file_requests_interval)::is_always_lock_free); --- databases/mysql80-server/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index e85c20172dd2..06864573e5f2 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -15,8 +15,8 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} SLAVEDIRS= databases/mysql80-client -USES= bison:build cmake:noninja compiler:c++17-lang cpe \ - groff:run libedit localbase ncurses perl5 pkgconfig shebangfix ssl +USES= bison:build cmake:noninja cpe groff:run libedit localbase \ + ncurses perl5 pkgconfig shebangfix ssl CPE_VENDOR= oracle @@ -53,7 +53,7 @@ BUILD_DEPENDS_powerpc64= libunwind>0:devel/libunwind BUILD_DEPENDS_powerpc64le= libunwind>0:devel/libunwind CMAKE_BUILD_TYPE= Release -CFLAGS+= -fPIC -malign-double +CFLAGS+= -fPIC CFLAGS_aarch64?= -march=armv8-a+crc+crypto CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ @@ -184,6 +184,14 @@ FEDERATED_SUB_LIST_OFF+= FEDER="" SSP_UNSAFE= yes .endif +.if ${ARCH} == powerpc +LDFLAGS+= -latomic +USES+= compiler:gcc-c++11-lib +.else +CXXFLAGS+= -malign-double +USES+= compiler:c++17-lang +.endif + post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h