From patchwork Sat Nov 19 14:40:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6142 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NDxCf4pFxz3xjQ for ; Sat, 19 Nov 2022 14:40:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NDxCd73HQz136; Sat, 19 Nov 2022 14:40:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NDxCd6MF4z2yVy; Sat, 19 Nov 2022 14:40:45 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NDxCc5bvDz2xNd for ; Sat, 19 Nov 2022 14:40:44 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4NDxCb5x7dz1KB; Sat, 19 Nov 2022 14:40:43 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1668868843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a2CYOvmlUG5LD+uYbMywM6JDvT7O7Lwt1T+MU3Lkw4o=; b=HLJ7L226RtBZjunEtdwfImccdDXfrrzkmBeRjWmVsVr6d/cx2oI+ZccWnv8PcbXjZ4nASW bmUwYMBbcJrC8uDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1668868843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a2CYOvmlUG5LD+uYbMywM6JDvT7O7Lwt1T+MU3Lkw4o=; b=g4KQlK3zBbW2+mc7kAhwoAvEQ82DrI4/Zz5WAUJ6OcC81wFeeDtQCid2DfqQN9mVUZuL6C Xf9Iwc7vUGX6SMa+VdUm50pA97flWr6WuphUz72h0NVfIxKMpdUoSQlThwIhK9qaYzRvra IsaGVcniCxyo3mqznvMSUYrvctU6tvuxeERIcyS+FBwjuc3wZQqQwov+Q55vmcgxD+PnJR n/CvlYnNM471xhi/AwEVG5EHFbv/VxpQoN76SJBpQBaIoeRNQR/3//B8KTNcSuPAyFE6Fx zhvu04IFBIBD+XKQDSGBZjNoetqbZgyqps3wXb4F9fFk0Te/tKoOru6Hc0PwdA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] gdb: Patch for building with readline-8.2 Date: Sat, 19 Nov 2022 15:40:35 +0100 Message-Id: <20221119144035.382952-2-adolf.belka@ipfire.org> In-Reply-To: <20221119144035.382952-1-adolf.belka@ipfire.org> References: <20221119144035.382952-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Patch required for successful building with readline-8.2 In readline 8.2 the type of rl_completer_word_break_characters changed to include const. Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer --- lfs/gdb | 1 + src/patches/gdb-readline8.2.patch | 35 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 src/patches/gdb-readline8.2.patch diff --git a/lfs/gdb b/lfs/gdb index f36e52c8c..bd5a57f29 100644 --- a/lfs/gdb +++ b/lfs/gdb @@ -70,6 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gdb-readline8.2.patch cd $(DIR_APP) && mkdir -pv build cd $(DIR_APP)/build && \ ../configure \ diff --git a/src/patches/gdb-readline8.2.patch b/src/patches/gdb-readline8.2.patch new file mode 100644 index 000000000..93724b109 --- /dev/null +++ b/src/patches/gdb-readline8.2.patch @@ -0,0 +1,35 @@ +From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Sun, 20 Mar 2022 14:01:54 +0100 +Subject: [PATCH] Add support for readline 8.2 + +In readline 8.2 the type of rl_completer_word_break_characters changed to +include const. +--- + gdb/completer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdb/completer.c b/gdb/completer.c +index d3900ae2014..a51c16ac7f8 100644 +--- a/gdb/completer.c ++++ b/gdb/completer.c +@@ -36,7 +36,7 @@ + calling a hook instead so we eliminate the CLI dependency. */ + #include "gdbcmd.h" + +-/* Needed for rl_completer_word_break_characters() and for ++/* Needed for rl_completer_word_break_characters and for + rl_filename_completion_function. */ + #include "readline/readline.h" + +@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw () + rl_basic_quote_characters = NULL; + } + +- return rl_completer_word_break_characters; ++ return (char *) rl_completer_word_break_characters; + } + + char * +-- +2.31.1