From 31906b36e514f42f9d410de618d3ee805bf3a101 Mon Sep 17 00:00:00 2001
From: henderkes <m@pyc.ac>
Date: Wed, 8 Oct 2025 08:48:30 +0200
Subject: [PATCH] reorder stuff for readline

---
 config/lib.json                          |  9 +++++++++
 config/source.json                       | 20 ++++++++++----------
 src/SPC/builder/extension/readline.php   |  2 +-
 src/SPC/builder/unix/library/libedit.php |  4 +---
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/config/lib.json b/config/lib.json
index 37faca3c..1719914b 100644
--- a/config/lib.json
+++ b/config/lib.json
@@ -343,6 +343,15 @@
         ],
         "cpp-library": true
     },
+    "libedit": {
+        "source": "libedit",
+        "static-libs-unix": [
+            "libedit.a"
+        ],
+        "lib-depends": [
+            "ncurses"
+        ]
+    },
     "libevent": {
         "source": "libevent",
         "static-libs-unix": [
diff --git a/config/source.json b/config/source.json
index fd138bbe..c13820df 100644
--- a/config/source.json
+++ b/config/source.json
@@ -489,6 +489,16 @@
             "path": "COPYING"
         }
     },
+    "libedit": {
+        "type": "filelist",
+        "url": "https://thrysoee.dk/editline/",
+        "regex": "/href=\"(?<file>libedit-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+        "provide-pre-built": true,
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "libevent": {
         "type": "ghrel",
         "repo": "libevent/libevent",
@@ -946,16 +956,6 @@
             "path": "LICENSE"
         }
     },
-    "libedit": {
-        "type": "filelist",
-        "url": "https://thrysoee.dk/editline/",
-        "regex": "/href=\"(?<file>editline-(?<version>[^\"]+)\\.tar\\.gz)\"/",
-        "provide-pre-built": true,
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
     "readline": {
         "type": "filelist",
         "url": "https://ftp.gnu.org/pub/gnu/readline/",
diff --git a/src/SPC/builder/extension/readline.php b/src/SPC/builder/extension/readline.php
index c0dd3e65..ccf489cb 100644
--- a/src/SPC/builder/extension/readline.php
+++ b/src/SPC/builder/extension/readline.php
@@ -23,7 +23,7 @@ class readline extends Extension
 
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        return '--with-libedit=' . BUILD_ROOT_PATH . ' --without-readline';
+        return '--with-libedit --without-readline';
     }
 
     public function buildUnixShared(): void
diff --git a/src/SPC/builder/unix/library/libedit.php b/src/SPC/builder/unix/library/libedit.php
index 8ac178c6..2f4c0dbc 100644
--- a/src/SPC/builder/unix/library/libedit.php
+++ b/src/SPC/builder/unix/library/libedit.php
@@ -11,9 +11,7 @@ trait libedit
     protected function build(): void
     {
         UnixAutoconfExecutor::create($this)
-            ->configure(
-                '--with-curses'
-            )
+            ->configure()
             ->make();
         $this->patchPkgconfPrefix(['libedit.pc']);
     }