Skip to content

Commit 1244547

Browse files
simon-essralphlange
authored andcommitted
Skip using libreadline for base 3.14
In base 3.15 onwards we have checks for the existence of readline.h. For base 3.14 we should just skip it.
1 parent 261f218 commit 1244547

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

cue.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,13 @@ def add_dependency(dep):
618618
sys.stdout.flush()
619619
sp.check_call(['patch', '-p1', '-i', os.path.join(ci['scriptsdir'], 'add-msi-to-314.patch')],
620620
cwd=place)
621+
622+
# Post 3.14 we have checks for readline.h
623+
print('Patching COMMANDLINE_LIBRARY to EPICS')
624+
sys.stdout.flush()
625+
sp.check_call(['patch', '-p1', '-i', os.path.join(ci['scriptsdir'], 'dont_use_readline_314.patch')],
626+
cwd=place)
627+
621628
else:
622629
# force including RELEASE.local for non-base modules by overwriting their configure/RELEASE
623630
release = os.path.join(place, "configure", "RELEASE")

dont_use_readline_314.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/configure/os/CONFIG_SITE.Common.linux-x86 b/configure/os/CONFIG_SITE.Common.linux-x86
2+
index 6c3a8308a..9c90967ec 100644
3+
--- a/configure/os/CONFIG_SITE.Common.linux-x86
4+
+++ b/configure/os/CONFIG_SITE.Common.linux-x86
5+
@@ -22,7 +22,7 @@
6+
# comment them all out to build without readline support.
7+
8+
# No other libraries needed (recent Fedora, Ubuntu etc.):
9+
-COMMANDLINE_LIBRARY = READLINE
10+
+#COMMANDLINE_LIBRARY = READLINE
11+
12+
# Needs -lncurses (RHEL 5 etc.):
13+
#COMMANDLINE_LIBRARY = READLINE_NCURSES

0 commit comments

Comments
 (0)