luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-09-07 19:36:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: remove the bundled readline/ subdirectory (Patch 3)

Browse Source 
Delete readline/ (the vendored GNU readline 4.3, ~104 files / 2 MB) now that
configure requires the system readline (Patch 1) and the Makefiles no longer
wire the bundled build (Patch 2).  Sweep the remaining references:

  * commands/Makefile.in: drop the `module: ${MAGICDIR}/readline/readline` rule
    and the readline-create-symlinks delegation (bundled-only; commands now uses
    the default `module: libcommands.o`).
  * commands/CmdFI.c, textio/txMain.c, textio/txInput.c: the readline includes
    had a `#ifdef HAVE_READLINE <system> #else "readline/readline/*.h" (bundled)`
    split.  HAVE_READLINE/NEED_READLINE are used nowhere else and USE_READLINE now
    always implies the system library, so collapse to the plain
    `#include <readline/readline.h>` / `<history.h>`.
  * CI: main.yml's non-Tcl job installs libreadline-dev (was relying on bundled);
    canary-matrix drops the now-invalid no_tk_tcl_brl / --enable-readline-bundled
    variant.
  * .gitignore: drop the "readline/ intentionally not converted" note.

Verified: Tcl -j12 builds+installs 375 files (commands builds, no readline-dir
references); --without-tcl --disable-readline -j12 builds (x2); --without-tcl with
no readline dev package still errors with the guidance message.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
This commit is contained in:
Darryl L. Miles
2026-07-26 14:54:11 -04:00
committed by R. Timothy Edwards
co-authored by Claude Opus 4.8
parent 5e8b81cbcc
commit 293c111bc3
111 changed files with 9 additions and 65067 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/canary-matrix.yml
+1 -6
View File
@@ -15,7 +15,7 @@ jobs:
os: [ubuntu-26.04, ubuntu-24.04, ubuntu-22.04]
# Configure Options
# X11 OGL CAIRO
pkgs: [all, none, no_tk_tcl_rl, no_tk_tcl_brl, no_zlib, no_gc_gl_gu, no_gc, no_gl_gu]
pkgs: [all, none, no_tk_tcl_rl, no_zlib, no_gc_gl_gu, no_gc, no_gl_gu]
# Toolchain:
# ubuntu-20.04 [gcc-9, clang-10] # gcc-7 .. gcc-10 / clang-7 .. clang-12 + clang-18
# ubuntu-22.04 [gcc-11, clang-14] # gcc-9 .. gcc-12 / clang-11 .. clang-15
@@ -110,7 +110,6 @@ jobs:
# z no.*_zl zlib1g-dev
# n no.*_nc libncurses-dev
# r no.*_rl libreadline-dev
# R no.*_brl --enable-readline-bundled
# c no.*_tcl tcl-dev
# k no.*_tk tk-dev
# C no.*_gc libcairo-dev
@@ -121,8 +120,6 @@ jobs:
pkgs=$(echo -n "$pkgs" | sed -e 's#z##'); fi
if echo -n "$MATRIX_PKGS" | grep -q "^no.*_nc"; then
pkgs=$(echo -n "$pkgs" | sed -e 's#n##'); fi
if echo -n "$MATRIX_PKGS" | grep -q "^no.*_brl"; then
pkgs=$(echo -n "$pkgs" | sed -e 's#r#R#'); fi # replace
if echo -n "$MATRIX_PKGS" | grep -q "^no.*_rl"; then
pkgs=$(echo -n "$pkgs" | sed -e 's#r##'); fi
if echo -n "$MATRIX_PKGS" | grep -q "^no.*_tcl"; then
@@ -160,8 +157,6 @@ jobs:
_configure_args+=(--disable-readline); fi
if echo -n "$MATRIX_PKGS" | grep -q "^no.*_zl"; then
_configure_args+=(--disable-compression); fi
if echo -n "$MATRIX_PKGS" | grep -q "^no.*_brl"; then
_configure_args+=(--enable-readline-bundled); fi
if echo -n "$MATRIX_PKGS" | grep -q "^no.*_rl"; then
_configure_args+=(--disable-readline); fi
if echo -n "$MATRIX_PKGS" | grep -q "^no.*_tcl"; then
.github/workflows/main.yml
+7 -7
View File
@@ -34,19 +34,19 @@ jobs:
done
standard_build_linux:
# Non-Tcl "standard" configuration: native magic binary + bundled GNU
# readline. Distinct code paths (MAGIC_WRAPPER off, bundled readline) that
# the Tcl build above does not exercise.
# Non-Tcl "standard" configuration: native magic binary + system GNU
# readline. Distinct code paths (MAGIC_WRAPPER off, readline) that the Tcl
# build above does not exercise.
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: Get Dependencies
# X11 + cairo for graphics; ncurses for the bundled readline's configure;
# texlive for the docs. NB: package set not validated on the runner --
# adjust if the build cannot find a library.
# X11 + cairo for graphics; readline (the non-Tcl line editor) + its
# ncurses dependency; texlive for the docs. NB: package set not validated
# on the runner -- adjust if the build cannot find a library.
run: |
sudo apt-get update
sudo apt-get install -y libx11-dev libcairo-dev libncurses-dev \
sudo apt-get install -y libx11-dev libcairo-dev libreadline-dev libncurses-dev \
texlive-latex-base texlive-latex-recommended texlive-fonts-recommended
- name: Build (non-Tcl / standard)
run: |