From nobody Thu Jun 22 11:46:34 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 4Qmz9Q5MqBz4fmFG; Thu, 22 Jun 2023 11:46:34 +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 4Qmz9Q4x75z3MZH; Thu, 22 Jun 2023 11:46:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687434394; 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=LBO7GtISD+mFEnY7nLarbqkmICxHImgmMILq2zQwLuQ=; b=fiMqvdeTFMcBTKlx2muispJMlWDtzBuS0NV5+uSwfD6VEZOBARYHrEAbgNKomeOI2xr6f3 v2Uovypep+S7rq9b3KY5OEib5zq/MxosCHiIoW2WzT1BX5kAiXOnC7By46tVXX0lkIpVqr 8Ve7/G3c+gnKxF8AkULGFqUyrvnlP3F/9LZtLT81qpZjMir5BOK0h4Sb3J2q8GKPDOtvBs AYqBwky7jlpAzuvTTnYSjGtAbC0A9SkGieKi0LWCXEoJDusgbBGQv14IVkOxl6FgOnxHoZ 6qnNLuqMAJY2uNByfrMv23cX7sgk/2mX934pa2TgiNvytkqcr99RMeE/WykgAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687434394; 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=LBO7GtISD+mFEnY7nLarbqkmICxHImgmMILq2zQwLuQ=; b=LqvZ7ASv4KR0OnDCchByE3c0XEk3m9F5sKnWLNOS72EltpTc4JOJ6mtMZhGOkCQwnG2ot+ /m6vs4EiFEzZO3S8ZUBuigT6RTZnfnpHxewrLPN9arIut9nxrl/qiUTEELim3osRVbZfH+ 6xLh7zm6yxO3WSSgp7bP3M4ueslUYdpbuQciSU52KhXufoiDni7SvowvKAWMrmPVLZa5NP HUYOgbgLT7dqnzADw6NTJ5XxZeI1SpCEwYPGrR5JU8sRBC0klSjjp1M1J/AP/u7LWIuQ5b wO3OShoMOmKsE/VJMxEjkG43PNXeL7TLOqY10O8zXEcwGQpSvMiEOfuXzTXsSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687434394; a=rsa-sha256; cv=none; b=wp3jjqUN47xJSFcQVh/cUfCWh4j3YcgByhzhBt2IcB4ffVY45kWtAJpqjewwxZmBt2OeJI 5Vpq8wuAyTRxuixHR+tg4ftsbKEbdZlLudxMbA5gWVpW38H21vho1h8kf11xlxdQFaZHoY NyU41xxCu3EVbqaWcIDip6EPv8PU3OFhcwuzB3XKOSS6VrJAFDcViLD1UNzit2w3+AuInH 22w/ncc5U4aqwZTncvpVYL8iOXLzwHC/l42pImR8Eav3LEVr1f3xS2D9QSE4uW6/xSwfPJ aaB1gQBb6bMA6uLylFyJ2iCBcUzt/vqiNRQR0MQy0bBM60Jl49BhOjcREAyVYQ== 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 4Qmz9Q3zktzLsC; Thu, 22 Jun 2023 11:46:34 +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 35MBkYFL034300; Thu, 22 Jun 2023 11:46:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MBkYH5034299; Thu, 22 Jun 2023 11:46:34 GMT (envelope-from git) Date: Thu, 22 Jun 2023 11:46:34 GMT Message-Id: <202306221146.35MBkYH5034299@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kirill Ponomarev Subject: git: ff90cfd475b6 - main - lang/sbcl: Fix build with clang 16 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: krion X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff90cfd475b6d26d90965e6a5bce0c86204c7e88 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff90cfd475b6d26d90965e6a5bce0c86204c7e88 commit ff90cfd475b6d26d90965e6a5bce0c86204c7e88 Author: Kirill Ponomarev AuthorDate: 2023-06-22 11:45:46 +0000 Commit: Kirill Ponomarev CommitDate: 2023-06-22 11:45:46 +0000 lang/sbcl: Fix build with clang 16 PR: 271711 Reported by: dim --- lang/sbcl/files/patch-src_runtime_bsd-os.c | 57 ++++++++---------------------- 1 file changed, 15 insertions(+), 42 deletions(-) diff --git a/lang/sbcl/files/patch-src_runtime_bsd-os.c b/lang/sbcl/files/patch-src_runtime_bsd-os.c index a602974be9e2..3bdafd457b51 100644 --- a/lang/sbcl/files/patch-src_runtime_bsd-os.c +++ b/lang/sbcl/files/patch-src_runtime_bsd-os.c @@ -1,42 +1,15 @@ -commit c76381656baeee9bdeddd899cb595c2b45294597 -Author: Dimitry Andric -Date: 2023-05-29 19:50:57 +0200 - - lang/sbcl: fix build with clang 16 - - Clang 16 has a new error about incompatible function types, which shows - up when building lang/sbcl: - - bsd-os.c:285:50: error: incompatible function pointer types passing '__siginfohandler_t *' (aka 'void (*)(int, struct __siginfo *, void *)') to parameter of type 'interrupt_handler_t' (aka 'void (*)(int, struct __siginfo *, struct __ucontext *)') [-Wincompatible-function-pointer-types] - (__siginfohandler_t *) - ^~~~~~~~~~~~~~~~~~~~~~ - ./interrupt.h:123:64: note: passing argument to parameter 'handler' here - extern void ll_install_handler(int signal, interrupt_handler_t handler); - ^ - - Indeed the __siginfohandler_t type is incompatible, but that is caused - by the cast itself, which does not seem to be good for anything. Remove - it, so the mismatch is gone. - -diff --git a/lang/sbcl/files/patch-src_runtime_bsd-os.c b/lang/sbcl/files/patch-src_runtime_bsd-os.c -new file mode 100644 -index 000000000000..3faf2f345709 ---- /dev/null -+++ b/lang/sbcl/files/patch-src_runtime_bsd-os.c -@@ -0,0 +1,15 @@ -+--- src/runtime/bsd-os.c.orig 2023-04-30 08:33:10 UTC -++++ src/runtime/bsd-os.c -+@@ -280,11 +280,7 @@ os_install_interrupt_handlers(void) -+ os_install_interrupt_handlers(void) -+ { -+ if (INSTALL_SIG_MEMORY_FAULT_HANDLER) { -+- ll_install_handler(SIG_MEMORY_FAULT, -+-#if defined(LISP_FEATURE_FREEBSD) && !defined(__GLIBC__) -+- (__siginfohandler_t *) -+-#endif -+- memory_fault_handler); -++ ll_install_handler(SIG_MEMORY_FAULT, memory_fault_handler); -+ -+ #ifdef LISP_FEATURE_DARWIN -+ /* Unmapped pages get this and not SIGBUS. */ - +--- src/runtime/bsd-os.c.orig 2023-05-28 10:34:18 UTC ++++ src/runtime/bsd-os.c +@@ -283,11 +283,7 @@ os_install_interrupt_handlers(void) + os_install_interrupt_handlers(void) + { + if (INSTALL_SIG_MEMORY_FAULT_HANDLER) { +- ll_install_handler(SIG_MEMORY_FAULT, +-#if defined(LISP_FEATURE_FREEBSD) && !defined(__GLIBC__) +- (__siginfohandler_t *) +-#endif +- memory_fault_handler); ++ ll_install_handler(SIG_MEMORY_FAULT, memory_fault_handler); + + #ifdef LISP_FEATURE_DARWIN + /* Unmapped pages get this and not SIGBUS. */