unix: always link against libedit

Before, CPython 3.8 and 3.9 on Linux linked against readline by default and built a variant that linked against libedit. After, all CPython versions on POSIX platforms link against libedit and don't publish a readline variant. In my opinion maintaining the code to support extension module variants is too much complexity. If my memories are correct, the reason I introduced this complexity was to avoid taking a ton of patches to CPython. This was at a time where we had significantly fewer patches and I was trying to keep the CPython source as close as possible to upstream. Fast forward a few years and we have a ton of patches and I'm no longer scared to take patches. Another factor was likely that readline.c required a massive patch to support libedit outside of macOS because of excessive use of `#ifdef __APPLE__`. This code was cleaned up in Python 3.8 (I think) and patches to support libedit because much more manageable. This commit removes the readline extension module variants, changes libedit to be the default library, and deletes references to readline from the code base. Good riddance.
indygreg · Jan 2, 2023 · 02e8695 · 02e8695
1 parent 241f4f0
commit 02e8695
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 869 deletions.
diff --git a/LICENSE.readline.txt b/LICENSE.readline.txt
diff --git a/cpython-unix/Makefile b/cpython-unix/Makefile
@@ -182,14 +182,6 @@ $(OUTDIR)/libedit-$(LIBEDIT_VERSION)-$(PACKAGE_SUFFIX).tar: $(LIBEDIT_DEPENDS)
 $(OUTDIR)/patchelf-$(PATCHELF_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-patchelf.sh
 	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) patchelf
 
-READLINE_DEPENDS = \
-    $(PYTHON_DEP_DEPENDS) \
-    $(OUTDIR)/ncurses-$(NCURSES_VERSION)-$(PACKAGE_SUFFIX).tar \
-    $(HERE)/build-readline.sh
-
-$(OUTDIR)/readline-$(READLINE_VERSION)-$(PACKAGE_SUFFIX).tar: $(READLINE_DEPENDS)
-	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) readline
-
 $(OUTDIR)/sqlite-$(SQLITE_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-sqlite.sh
 	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) sqlite
 
@@ -256,7 +248,6 @@ PYTHON_DEPENDS := \
     $(if $(NEED_NCURSES),$(OUTDIR)/ncurses-$(NCURSES_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_OPENSSL),$(OUTDIR)/openssl-$(OPENSSL_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_PATCHELF),$(OUTDIR)/patchelf-$(PATCHELF_VERSION)-$(PACKAGE_SUFFIX).tar) \
-    $(if $(NEED_READLINE),$(OUTDIR)/readline-$(READLINE_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_SQLITE),$(OUTDIR)/sqlite-$(SQLITE_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_TCL),$(OUTDIR)/tcl-$(TCL_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_TK),$(OUTDIR)/tk-$(TK_VERSION)-$(PACKAGE_SUFFIX).tar) \

diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh
@@ -189,13 +189,10 @@ patch -p1 < ${ROOT}/patch-ctypes-callproc.patch
 patch -p1 < ${ROOT}/patch-ctypes-static-binary.patch
 
 # CPython 3.10 added proper support for building against libedit outside of
-# macOS. On older versions, we need to patch readline.c and distribute
-# multiple extension module variants.
+# macOS. On older versions, we need to patch readline.c.
 #
 # USE_LIBEDIT comes from our static-modules file.
 if [[ "${PYTHON_MAJMIN_VERSION}" = "3.8" || "${PYTHON_MAJMIN_VERSION}" = "3.9" ]]; then
-    cp Modules/readline.c Modules/readline-libedit.c
-
     # readline.c assumes that a modern readline API version has a free_history_entry().
     # but libedit does not. Change the #ifdef accordingly.
     #
@@ -246,16 +243,18 @@ if [ "${PYBUILD_PLATFORM}" = "macos" ]; then
     CFLAGS="${CFLAGS} -Werror=unguarded-availability-new"
 fi
 
-# CPython 3.10 introduced proper support for libedit on all platforms. Link against
-# libedit by default because it isn't GPL.
-#
-# Ideally we wouldn't need to adjust global compiler and linker flags. But configure
-# performs detection of readline features and sets some preprocessor defines accordingly.
-# So we define these accordingly.
-if [[ "${PYBUILD_PLATFORM}" != "macos" && "${PYTHON_MAJMIN_VERSION}" != "3.8" && "${PYTHON_MAJMIN_VERSION}" != "3.9" ]]; then
+# Always build against libedit instead of the default of readline.
+# macOS always uses the system libedit, so no tweaks are needed.
+if [ "${PYBUILD_PLATFORM}" != "macos" ]; then
+    # On Linux, we need to add our custom libedit to search paths.
     CFLAGS="${CFLAGS} -I${TOOLS_PATH}/deps/libedit/include"
     LDFLAGS="${LDFLAGS} -L${TOOLS_PATH}/deps/libedit/lib"
-    EXTRA_CONFIGURE_FLAGS="${EXTRA_CONFIGURE_FLAGS} --with-readline=editline"
+
+    # CPython 3.10 introduced proper configure support for libedit, so add configure
+    # flag there.
+    if [[ "${PYTHON_MAJMIN_VERSION}" != "3.8" && "${PYTHON_MAJMIN_VERSION}" != "3.9" ]]; then
+        EXTRA_CONFIGURE_FLAGS="${EXTRA_CONFIGURE_FLAGS} --with-readline=editline"
+    fi
 fi
 
 CPPFLAGS=$CFLAGS

diff --git a/cpython-unix/build-readline.sh b/cpython-unix/build-readline.sh
diff --git a/cpython-unix/build.py b/cpython-unix/build.py
@@ -354,38 +354,6 @@ def build_libedit(
         build_env.get_tools_archive(dest_archive, "deps")
 
 
-def build_readline(
-    settings, client, image, host_platform, target_triple, optimizations, dest_archive
-):
-    readline_archive = download_entry("readline", DOWNLOADS_PATH)
-
-    with build_environment(client, image) as build_env:
-        if settings.get("needs_toolchain"):
-            build_env.install_toolchain(
-                BUILD,
-                host_platform,
-                binutils=True,
-                clang=True,
-                musl="musl" in target_triple,
-            )
-
-        build_env.install_artifact_archive(
-            BUILD, "ncurses", target_triple, optimizations
-        )
-        build_env.copy_file(readline_archive)
-        build_env.copy_file(SUPPORT / "build-readline.sh")
-
-        env = {
-            "TOOLCHAIN": "clang-%s" % host_platform,
-            "READLINE_VERSION": DOWNLOADS["readline"]["version"],
-        }
-
-        add_target_env(env, host_platform, target_triple, build_env)
-
-        build_env.run("build-readline.sh", environment=env)
-        build_env.get_tools_archive(dest_archive, "deps")
-
-
 def build_tix(
     settings, client, image, host_platform, target_triple, optimizations, dest_archive
 ):
@@ -1013,17 +981,6 @@ def main():
                 dest_archive=dest_archive,
             )
 
-        elif action == "readline":
-            build_readline(
-                settings,
-                client,
-                get_image(client, ROOT, BUILD, docker_image),
-                host_platform=host_platform,
-                target_triple=target_triple,
-                optimizations=optimizations,
-                dest_archive=dest_archive,
-            )
-
         elif action in (
             "bdb",
             "bzip2",

diff --git a/cpython-unix/patch-readline-libedit.patch b/cpython-unix/patch-readline-libedit.patch
@@ -1,7 +1,7 @@
-diff --git a/Modules/readline-libedit.c b/Modules/readline-libedit.c
+diff --git a/Modules/readline.c b/Modules/readline.c
 index 1e74f997b0..56a36e26e6 100644
---- a/Modules/readline-libedit.c
-+++ b/Modules/readline-libedit.c
+--- a/Modules/readline.c
++++ b/Modules/readline.c
 @@ -511,7 +511,7 @@ set the word delimiters for completion");
 
  /* _py_free_history_entry: Utility function to free a history entry. */

diff --git a/cpython-unix/static-modules.3.8.aarch64-unknown-linux-gnu b/cpython-unix/static-modules.3.8.aarch64-unknown-linux-gnu
@@ -29,9 +29,4 @@ _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I/tools/deps/include/X11 -L/tool
 _uuid _uuidmodule.c -I/tools/deps/include/uuid -luuid
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/static-modules.3.8.i686-unknown-linux-gnu b/cpython-unix/static-modules.3.8.i686-unknown-linux-gnu
@@ -27,9 +27,4 @@ _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I/tools/deps/include/X11 -L/tool
 _uuid _uuidmodule.c -I/tools/deps/include/uuid -luuid
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/static-modules.3.8.linux64 b/cpython-unix/static-modules.3.8.linux64
@@ -28,9 +28,4 @@ _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I/tools/deps/include/X11 -L/tool
 _uuid _uuidmodule.c -I/tools/deps/include/uuid -luuid
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/static-modules.3.9.aarch64-unknown-linux-gnu b/cpython-unix/static-modules.3.9.aarch64-unknown-linux-gnu
@@ -35,9 +35,4 @@ _xxsubinterpreters _xxsubinterpretersmodule.c
 _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/static-modules.3.9.armv7-unknown-linux-gnueabi b/cpython-unix/static-modules.3.9.armv7-unknown-linux-gnueabi
@@ -35,9 +35,4 @@ _xxsubinterpreters _xxsubinterpretersmodule.c
 _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/static-modules.3.9.armv7-unknown-linux-gnueabihf b/cpython-unix/static-modules.3.9.armv7-unknown-linux-gnueabihf
@@ -35,9 +35,4 @@ _xxsubinterpreters _xxsubinterpretersmodule.c
 _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/static-modules.3.9.i686-unknown-linux-gnu b/cpython-unix/static-modules.3.9.i686-unknown-linux-gnu
@@ -36,9 +36,4 @@ _xxsubinterpreters _xxsubinterpretersmodule.c
 _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/static-modules.3.9.linux64 b/cpython-unix/static-modules.3.9.linux64
@@ -35,9 +35,4 @@ _xxsubinterpreters _xxsubinterpretersmodule.c
 _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/static-modules.3.9.mips-unknown-linux-gnu b/cpython-unix/static-modules.3.9.mips-unknown-linux-gnu
@@ -35,9 +35,4 @@ _xxsubinterpreters _xxsubinterpretersmodule.c
 _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/static-modules.3.9.mipsel-unknown-linux-gnu b/cpython-unix/static-modules.3.9.mipsel-unknown-linux-gnu
@@ -35,9 +35,4 @@ _xxsubinterpreters _xxsubinterpretersmodule.c
 _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/static-modules.3.9.s390x-unknown-linux-gnu b/cpython-unix/static-modules.3.9.s390x-unknown-linux-gnu
@@ -35,9 +35,4 @@ _xxsubinterpreters _xxsubinterpretersmodule.c
 _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 ossaudiodev ossaudiodev.c
 pyexpat pyexpat.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c -DHAVE_EXPAT_CONFIG_H=1 -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI -IModules/expat
-# readline variant needs to come first because libreadline is in /tools/deps and is
-# picked up by build. We /could/ make libedit first. But since we employ a hack to
-# coerce use of libedit on Linux, it seems prudent for the build system to pick
-# up readline.
-readline VARIANT=readline readline.c -I/tools/deps/include -I/tools/deps/include/ncursesw -L/tools/deps/lib -lreadline -lncursesw
-readline VARIANT=libedit readline-libedit.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
+readline readline.c -DUSE_LIBEDIT=1 -I/tools/deps/libedit/include -I/tools/deps/libedit/include/ncursesw -L/tools/deps/libedit/lib -ledit -lncursesw
diff --git a/cpython-unix/targets.yml b/cpython-unix/targets.yml
@@ -161,7 +161,6 @@ aarch64-unknown-linux-gnu:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -235,7 +234,6 @@ armv7-unknown-linux-gnueabi:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -271,7 +269,6 @@ armv7-unknown-linux-gnueabihf:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -314,7 +311,6 @@ i686-unknown-linux-gnu:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -350,7 +346,6 @@ mips-unknown-linux-gnu:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -386,7 +381,6 @@ mipsel-unknown-linux-gnu:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -422,7 +416,6 @@ s390x-unknown-linux-gnu:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -662,7 +655,6 @@ x86_64-unknown-linux-gnu:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -702,7 +694,6 @@ x86_64_v2-unknown-linux-gnu:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -742,7 +733,6 @@ x86_64_v3-unknown-linux-gnu:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -782,7 +772,6 @@ x86_64_v4-unknown-linux-gnu:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -822,7 +811,6 @@ x86_64-unknown-linux-musl:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -863,7 +851,6 @@ x86_64_v2-unknown-linux-musl:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -904,7 +891,6 @@ x86_64_v3-unknown-linux-musl:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk
@@ -945,7 +931,6 @@ x86_64_v4-unknown-linux-musl:
     - ncurses
     - openssl
     - patchelf
-    - readline
     - sqlite
     - tcl
     - tk