From 840d249453fe844806e86f33bdba99af4456d08e Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Tue, 15 Jul 2025 08:22:41 +0200 Subject: [PATCH 1/2] Refresh readline to 8.3 The old version, 8.0, creates warnings on modern compilers. --- .../org_gnu_readline/bundled.BUILD.bazel | 1 + .../org_gnu_readline/org_gnu_readline.bzl | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dependency_support/org_gnu_readline/bundled.BUILD.bazel b/dependency_support/org_gnu_readline/bundled.BUILD.bazel index 3e524831..1f503f6e 100644 --- a/dependency_support/org_gnu_readline/bundled.BUILD.bazel +++ b/dependency_support/org_gnu_readline/bundled.BUILD.bazel @@ -126,6 +126,7 @@ pseudo_configure( "HAVE_TERMCAP_H": "1", "HAVE_TERMIO_H": "1", "HAVE_TERMIOS_H": "1", + "HAVE_TIMEVAL" : "1", "HAVE_UNISTD_H": "1", "HAVE_WCHAR_H": "1", "HAVE_WCTYPE_H": "1", diff --git a/dependency_support/org_gnu_readline/org_gnu_readline.bzl b/dependency_support/org_gnu_readline/org_gnu_readline.bzl index 8d7c0177..0ff96771 100644 --- a/dependency_support/org_gnu_readline/org_gnu_readline.bzl +++ b/dependency_support/org_gnu_readline/org_gnu_readline.bzl @@ -22,12 +22,12 @@ def org_gnu_readline(): http_archive, name = "org_gnu_readline", urls = [ - "https://ftp.gnu.org/gnu/readline/readline-8.0.tar.gz", - "http://ftp.vim.org/ftp/gnu/readline/readline-8.0.tar.gz", - "http://ftp.swin.edu.au/gnu/readline/readline-8.0.tar.gz", + "https://ftp.gnu.org/gnu/readline/readline-8.3.tar.gz", + "http://ftp.vim.org/ftp/gnu/readline/readline-8.3.tar.gz", + "http://ftp.swin.edu.au/gnu/readline/readline-8.3.tar.gz", ], - sha256 = "e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461", - strip_prefix = "readline-8.0", + sha256 = "fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc", + strip_prefix = "readline-8.3", build_file = Label("//dependency_support/org_gnu_readline:bundled.BUILD.bazel"), patches = [ Label("@rules_hdl//dependency_support/org_gnu_readline:missing_include.patch"), From b80d91473c316adfdd0a4ca5c837c1a4dbcbb1c4 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Tue, 15 Jul 2025 09:58:49 +0200 Subject: [PATCH 2/2] Update magic to include the header defining CPPFunction --- .../com_opencircuitdesign_magic.bzl | 1 + .../rltypedefs.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 dependency_support/com_opencircuitdesign_magic/rltypedefs.patch diff --git a/dependency_support/com_opencircuitdesign_magic/com_opencircuitdesign_magic.bzl b/dependency_support/com_opencircuitdesign_magic/com_opencircuitdesign_magic.bzl index d8e66383..7bf7b985 100644 --- a/dependency_support/com_opencircuitdesign_magic/com_opencircuitdesign_magic.bzl +++ b/dependency_support/com_opencircuitdesign_magic/com_opencircuitdesign_magic.bzl @@ -30,5 +30,6 @@ def com_opencircuitdesign_magic(): patches = [ Label("@rules_hdl//dependency_support/com_opencircuitdesign_magic:magic_wrapper.patch"), Label("@rules_hdl//dependency_support/com_opencircuitdesign_magic:use_bash.patch"), + Label("@rules_hdl//dependency_support/com_opencircuitdesign_magic:rltypedefs.patch"), ], ) diff --git a/dependency_support/com_opencircuitdesign_magic/rltypedefs.patch b/dependency_support/com_opencircuitdesign_magic/rltypedefs.patch new file mode 100644 index 00000000..59999944 --- /dev/null +++ b/dependency_support/com_opencircuitdesign_magic/rltypedefs.patch @@ -0,0 +1,18 @@ +--- textio/txMain.c 2020-08-11 22:50:26.000000000 +0200 ++++ textio/txMain.c 2025-07-15 10:15:29.672949422 +0200 +@@ -43,12 +43,15 @@ + global bool TxStdoutIsatty; + + #ifdef USE_READLINE ++#define WANT_OBSOLETE_TYPEDEFS 1 + #ifdef HAVE_READLINE + #include + #include ++#include + #else + #include "readline/readline.h" + #include "readline/history.h" ++#include "readline/rltypedefs.h" + #endif + + int TxPrefix(void);