From 56f841d13268464ec7a0c27bd2c7b131bdf66505 Mon Sep 17 00:00:00 2001
From: Akash Levy <akash@silimate.com>
Date: Sun, 17 Nov 2024 10:44:05 -0800
Subject: [PATCH 1/2] Fix editline

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d1b6ff2c1..bce81669f 100644
--- a/Makefile
+++ b/Makefile
@@ -396,12 +396,12 @@ ifeq ($(CONFIG),mxe)
 LIBS += -ltermcap
 endif
 else
-ifeq ($(ENABLE_EDITLINE),1)
-CXXFLAGS += -DYOSYS_ENABLE_EDITLINE
-LIBS += -ledit -ltinfo -lbsd
-else
 ABCMKARGS += "ABC_USE_NO_READLINE=1"
 endif
+
+ifeq ($(ENABLE_EDITLINE),1)
+CXXFLAGS += -DYOSYS_ENABLE_EDITLINE
+LIBS += -ledit
 endif
 
 ifeq ($(DISABLE_ABC_THREADS),1)

From 47a2a09e89907b9e8cd67f277c67628dea69ce64 Mon Sep 17 00:00:00 2001
From: Akash Levy <akash@silimate.com>
Date: Sun, 17 Nov 2024 23:23:37 -0800
Subject: [PATCH 2/2] Enforce mutual exclusion on readline/editline

---
 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index bce81669f..b0e44e0d9 100644
--- a/Makefile
+++ b/Makefile
@@ -396,13 +396,12 @@ ifeq ($(CONFIG),mxe)
 LIBS += -ltermcap
 endif
 else
-ABCMKARGS += "ABC_USE_NO_READLINE=1"
-endif
-
 ifeq ($(ENABLE_EDITLINE),1)
 CXXFLAGS += -DYOSYS_ENABLE_EDITLINE
 LIBS += -ledit
 endif
+ABCMKARGS += "ABC_USE_NO_READLINE=1"
+endif
 
 ifeq ($(DISABLE_ABC_THREADS),1)
 ABCMKARGS += "ABC_USE_NO_PTHREADS=1"