From nobody Wed Oct 09 12:06:38 2024 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 4XNs7M0vBKz5YSPS; Wed, 09 Oct 2024 12:06:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNs7M0Gv5z4Trm; Wed, 9 Oct 2024 12:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728475599; 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=xHPB+K6/JxoDorTxYz7uufOdJ/GHrXg400HLRJFfMtQ=; b=N2k8eiyEzECkCRB03AC1CHqWCQ/JdSbgKbiUTNLjYoAKryQZIMUQolWXgMKVfeyvuyrG5E +M5KXj9ibYHGvw0xXFIZAMi0ff+JWVzjM0tcQBU0Qq5sfSYB3qtOJWhi8sLqxdu4IxPAEk r20fo0m8L+S2pIVduTAj4vGWOGdVvFqe+1N/uUecyEjvIdNUwL/3itnBIHlfvSTL11XMVa U8obULsm/wBzR7jOqRvuqZ4fOmLbLLOz6xHrNP98iGja1ZLlRLqss9FvF/AKnMqGEkmdi5 lrPEKCpn4S4v2u7FODznnQaUGVHgF/9hm2big6O+ubQd4D1nnXhi1u3rS9c1Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728475599; 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=xHPB+K6/JxoDorTxYz7uufOdJ/GHrXg400HLRJFfMtQ=; b=S8uM/AXZYm0FUJKh8ihQHqeYXvCLdbV7YXbM5DfNU3scch5bCbwezlJBEXlgMuKl6ycHk+ at3jb8+6kpL6bR0fksxE1lm9rJXAkLqLHWiHqPhHGNT7U3og6R+ji7hJzeG/hfjb55CyLe DItkbn+9iNSsvlfXlu2siqJUpRG/xwqPla/aVo986ItpJLFcx2Yn1Q3UlsTsOZ81IooUha RJGlVzhEyOQ9dfzJZ6Meq6MFpjCbLzWY2o7/hfiqtEruF05L5fyKLUmzwAr2GxJl8gbun6 +k+y+HJet2+kBOzMsAig1QfuMuVF6LYEyJ2QUzMaoHlDi8VBI3eLxijdCNU98Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728475599; a=rsa-sha256; cv=none; b=RBYxq+4y5JGeXZXwK7eVoIyCtFMmmFf0gWuijS1oaIYByN/R8HeerdIFP8A0KtX7PJ1fCR hvcYoUlSRp8Hbt+rkKu9TltjSLL1flBAoxOUlx46yAn9vTlc2P2dg/Iy0+njeGB92nCZZt b2kWkk2QvSPQ3UTsquUbGWLFaZG5DPFYfPKlGs8SphmMGa3DipORIZG+pp9v7p2MiGx/SA cqy6LPoXyA+MWtzlWawGCOkSSZ1b0/8hhzv7GAjUhfc0bJ4qehlBGX5WTq9faHbh4l3GG1 OJ7cbDhc22eTSBzoSfORDgNZLG98qTbQbcLwjy2IeDH+jFE+bkytMVDS70PPbw== 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 4XNs7L7013z1CZp; Wed, 9 Oct 2024 12:06:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499C6cwj007736; Wed, 9 Oct 2024 12:06:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499C6crV007733; Wed, 9 Oct 2024 12:06:38 GMT (envelope-from git) Date: Wed, 9 Oct 2024 12:06:38 GMT Message-Id: <202410091206.499C6crV007733@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6d04fa18daaa - main - devel/readline: Fix build for dependent ports. 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d04fa18daaad2b5452685c842f54430e5908bf8 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d04fa18daaad2b5452685c842f54430e5908bf8 commit 6d04fa18daaad2b5452685c842f54430e5908bf8 Author: Dag-Erling Smørgrav AuthorDate: 2024-10-09 12:06:09 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-10-09 12:06:09 +0000 devel/readline: Fix build for dependent ports. Fixes: ee994524fffd PR: 281633 Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D46957 --- devel/readline/Makefile | 2 +- devel/readline/files/patch-clang18 | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/devel/readline/Makefile b/devel/readline/Makefile index 0a29786623fb..72ea4704033c 100644 --- a/devel/readline/Makefile +++ b/devel/readline/Makefile @@ -1,6 +1,6 @@ PORTNAME= readline PORTVERSION= 8.2.${PATCHLEVEL} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNU DISTNAME= readline-${PORTVERSION:R} diff --git a/devel/readline/files/patch-clang18 b/devel/readline/files/patch-clang18 index f019f4ddb4a9..df9e8b671ddc 100644 --- a/devel/readline/files/patch-clang18 +++ b/devel/readline/files/patch-clang18 @@ -1,28 +1,31 @@ ---- readline.h.orig 2024-09-21 16:56:41 UTC +--- readline.h.orig 2022-02-18 16:13:59 UTC +++ readline.h -@@ -407,7 +407,7 @@ extern int rl_message (const char *, ...) __attribute - #if defined (USE_VARARGS) && defined (PREFER_STDARG) +@@ -404,10 +404,10 @@ extern int rl_mark_active_p (void); + extern void rl_deactivate_mark (void); + extern int rl_mark_active_p (void); + +-#if defined (USE_VARARGS) && defined (PREFER_STDARG) ++#if defined(__GNUC__) || defined(__clang__) extern int rl_message (const char *, ...) __attribute__((__format__ (printf, 1, 2))); #else -extern int rl_message (); -+extern int rl_message (void); ++extern int rl_message (const char *, ...); #endif extern int rl_show_char (int); --- rltypedefs.h.orig 2021-01-22 15:04:18 UTC +++ rltypedefs.h -@@ -32,10 +32,10 @@ extern "C" { +@@ -32,10 +32,13 @@ extern "C" { # define _FUNCTION_DEF #if defined(__GNUC__) || defined(__clang__) --typedef int Function () __attribute__((deprecated)); --typedef void VFunction () __attribute__((deprecated)); --typedef char *CPFunction () __attribute__((deprecated)); --typedef char **CPPFunction () __attribute__((deprecated)); -+typedef int Function (void) __attribute__((deprecated)); -+typedef void VFunction (void) __attribute__((deprecated)); -+typedef char *CPFunction (void) __attribute__((deprecated)); -+typedef char **CPPFunction (void) __attribute__((deprecated)); ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wstrict-prototypes" + typedef int Function () __attribute__((deprecated)); + typedef void VFunction () __attribute__((deprecated)); + typedef char *CPFunction () __attribute__((deprecated)); + typedef char **CPPFunction () __attribute__((deprecated)); ++#pragma GCC diagnostic pop #else typedef int Function (); typedef void VFunction ();