Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cue.py
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,13 @@ def add_dependency(dep):
sys.stdout.flush()
sp.check_call(['patch', '-p1', '-i', os.path.join(ci['scriptsdir'], 'add-msi-to-314.patch')],
cwd=place)

# Post 3.14 we have checks for readline.h
print('Patching COMMANDLINE_LIBRARY to EPICS')
sys.stdout.flush()
sp.check_call(['patch', '-p1', '-i', os.path.join(ci['scriptsdir'], 'dont_use_readline_314.patch')],
cwd=place)

else:
# force including RELEASE.local for non-base modules by overwriting their configure/RELEASE
release = os.path.join(place, "configure", "RELEASE")
Expand Down
13 changes: 13 additions & 0 deletions dont_use_readline_314.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/configure/os/CONFIG_SITE.Common.linux-x86 b/configure/os/CONFIG_SITE.Common.linux-x86
index 6c3a8308a..9c90967ec 100644
--- a/configure/os/CONFIG_SITE.Common.linux-x86
+++ b/configure/os/CONFIG_SITE.Common.linux-x86
@@ -22,7 +22,7 @@
# comment them all out to build without readline support.

# No other libraries needed (recent Fedora, Ubuntu etc.):
-COMMANDLINE_LIBRARY = READLINE
+#COMMANDLINE_LIBRARY = READLINE

# Needs -lncurses (RHEL 5 etc.):
#COMMANDLINE_LIBRARY = READLINE_NCURSES