From nobody Wed Feb 15 16:56:00 2023 X-Original-To: dev-commits-ports-all@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 4PH434509Xz3qYXN; Wed, 15 Feb 2023 16:56:00 +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 4PH4344SJJz3stR; Wed, 15 Feb 2023 16:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676480160; 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=UjYUTvcsTDLtUN2AHVx4zpQkxYuMySo0USNQwdpchPQ=; b=DVaNua0FB7TK2sOdRWWsFiGQdxxUGSgwDSwWRGf2LJH3y0+FC5y64m01bhIJGnXeK6rM1t wihxSh6wtmhudhidExasp6DnBiEoNehoqpxuYvmudtoM2lDZm7HwqsresE7Uyx7LdxEb6d ocgM3aGh1Z2f57OgFmHjUUyIxbX25Vo6kL/HvNLFOhNtI7YfJYW1e3WQVSWjfdXLuKrohe c1nDPmqBkWW2KIroBaLPlEyiE79kw57tMm//mVTVCZWFAjXUC6Z1ImAEIEOafo2XFfijPi rqt8heRoumJDXJBIyZhfChxraEZjDIXGd1UDwtWWMqCDINcwoOjeOuNWW779xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676480160; 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=UjYUTvcsTDLtUN2AHVx4zpQkxYuMySo0USNQwdpchPQ=; b=jVlQcp5dklWIIKdFrLLMT+VZZH83CYt4e6tN8/uhdlZcnBXDNC0I3N3hY23GGmvSRNNKew bIwLqMMrq7/EjXvv2X4Ziu1Y1NVHUG552pCA+KABZ3F6Nh/rCHWdTPDSoDZ3VYa1TudcMh OOQX0GtQWmq4fkfDv+M2OCR0C/jCmAjD7p+zKORRMcx73K6dcilrkHYJyfV4KmS0FatIs6 oDtAMInAci3GllpV7ZyhbXVBRtMclcwijmb9sC6ZdNxZRKet38Qy81gt6uD8jQKdI+NDVA mkuX5I8pj2mnG4doIsIlOiXU50VhgmO5xJWRMDQDxVydE5nqxhSlm3gzSJ249Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676480160; a=rsa-sha256; cv=none; b=H55nzmDTjZMgIDFUgS8aGF0Xsa9EMMQY1lcj7WOFXiRvvNeVtfSZyRamDp9Xk5XQ4TNC3x Y/UJ04UNB4gUc42b/wEFQkRIzmiJ1LzVQSyh7Iz0WaOifI6gfPD808d99AGlqArZeHz6Vy MiqzOgVABHLdFH9HYN7qf1kwyKriGLNQUMgtAEZo8b/ux5L0Zw7jHE8fZsgYVrCYLd5eXW 4OYlISnXe6wCqVxzP9BubE7tyoRrKSfp01L1XNun5q7HhlbaHLoJb8SdMQdSD3iKgtNIfy PcItfgmjDMlJstGJ46kGHaknfZSghl5Zf7QhDQgItbN9BGAutt4lugRsgpT9aQ== 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 4PH4343QK3zXBN; Wed, 15 Feb 2023 16:56:00 +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 31FGu0JX017139; Wed, 15 Feb 2023 16:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31FGu0dC017138; Wed, 15 Feb 2023 16:56:00 GMT (envelope-from git) Date: Wed, 15 Feb 2023 16:56:00 GMT Message-Id: <202302151656.31FGu0dC017138@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 38557f2f4558 - main - shells/ksh*: Permanently fix LLVM15 build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38557f2f4558bb032842d36050b7ce7dd1a3bfd3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=38557f2f4558bb032842d36050b7ce7dd1a3bfd3 commit 38557f2f4558bb032842d36050b7ce7dd1a3bfd3 Author: Cy Schubert AuthorDate: 2023-02-15 15:18:07 +0000 Commit: Cy Schubert CommitDate: 2023-02-15 16:55:03 +0000 shells/ksh*: Permanently fix LLVM15 build Fix aso atomics broken by LLVM: /wrkdirs/usr/ports/shells/ksh/work/ksh-1.0.4/src/lib/libast/aso/aso.c /wrkdirs/usr/ports/shells/ksh/work/ksh-1.0.4/src/lib/libast/aso/aso.c:839:10: error: incompatible integer to pointer conversion passing 'uint64_t' (aka 'unsigned long') to parameter of type 'void *' [-Wint-conversion] return _aso_casptr((void**)p, o, n); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./FEATURE/aso:19:66: note: expanded from macro '_aso_casptr' ^~~~~~~~~~~ /wrkdirs/usr/ports/shells/ksh/work/ksh-1.0.4/src/lib/libast/aso/aso.c:839:10: error: incompatible integer to pointer conversion passing 'uint64_t' (aka 'unsigned long') to parameter of type 'void *' [-Wint-conversion] return _aso_casptr((void**)p, o, n); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./FEATURE/aso:19:78: note: expanded from macro '_aso_casptr' ^~~~~~~~~~~ 2 errors generated. mamake [lib/libast]: *** exit code 1 making aso.o mamake: *** exit code 1 making lib/libast mamake: *** exit code 1 making all package: creating flat view package: make failed at Fri Feb 10 06:00:01 UTC 2023 in /wrkdirs/usr/ports/shells/ksh/work/ksh-1.0.4/arch/freebsd14.amd64-64 *** Error code 1 --- shells/ksh-devel/Makefile | 2 +- shells/ksh-devel/files/patch-src_lib_libast_aso_aso.c | 11 +++++++++++ shells/ksh/Makefile | 2 +- shells/ksh/files/patch-src_lib_libast_aso_aso.c | 11 +++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile index 7f2844d1855d..29496a0e319c 100644 --- a/shells/ksh-devel/Makefile +++ b/shells/ksh-devel/Makefile @@ -50,7 +50,7 @@ KSH93D_DESC= Install to ${PREFIX}/bin/ksh93d (development) CFLAGS+= -DMAP_TYPE LDFLAGS+= -lm -MAKE_ENV= CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses -Wno-int-conversion" CFLAGS="${CFLAGS}" +MAKE_ENV= CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses" CFLAGS="${CFLAGS}" STATIC_MAKE_ENV= LDFLAGS+=-static diff --git a/shells/ksh-devel/files/patch-src_lib_libast_aso_aso.c b/shells/ksh-devel/files/patch-src_lib_libast_aso_aso.c new file mode 100644 index 000000000000..6ab5be771f7a --- /dev/null +++ b/shells/ksh-devel/files/patch-src_lib_libast_aso_aso.c @@ -0,0 +1,11 @@ +--- src/lib/libast/aso/aso.c.orig 2023-01-11 01:32:04.000000000 -0800 ++++ src/lib/libast/aso/aso.c 2023-02-15 06:41:07.380213000 -0800 +@@ -836,7 +836,7 @@ + + #if defined(_aso_casptr) + if (!state.lockf) +- return _aso_casptr((void**)p, o, n); ++ return _aso_cas64((void**)p, o, n); + #endif + k = lock(state.data, 0, p); + if (*(void* volatile*)p == o) diff --git a/shells/ksh/Makefile b/shells/ksh/Makefile index e006024685ed..ca0d38165128 100644 --- a/shells/ksh/Makefile +++ b/shells/ksh/Makefile @@ -44,7 +44,7 @@ KSH93N_DESC= Install to ${PREFIX}/bin/ksh93n (new) CFLAGS+= -DMAP_TYPE LDFLAGS+= -lm -MAKE_ENV= CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses -Wno-int-conversion" CFLAGS="${CFLAGS}" +MAKE_ENV= CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses" CFLAGS="${CFLAGS}" STATIC_MAKE_ENV= LDFLAGS+=-static diff --git a/shells/ksh/files/patch-src_lib_libast_aso_aso.c b/shells/ksh/files/patch-src_lib_libast_aso_aso.c new file mode 100644 index 000000000000..891c022d470e --- /dev/null +++ b/shells/ksh/files/patch-src_lib_libast_aso_aso.c @@ -0,0 +1,11 @@ +--- src/lib/libast/aso/aso.c.orig 2022-10-21 20:05:14.000000000 -0700 ++++ src/lib/libast/aso/aso.c 2023-02-15 06:39:08.156515000 -0800 +@@ -836,7 +836,7 @@ + + #if defined(_aso_casptr) + if (!state.lockf) +- return _aso_casptr((void**)p, o, n); ++ return _aso_cas64((void**)p, o, n); + #endif + k = lock(state.data, 0, p); + if (*(void* volatile*)p == o)