From 42c7dbcd21b82ee4c9d43e1d43b05ec8445009f3 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 8 Jun 2022 09:28:44 -0700 Subject: [PATCH] remove Makefile readline.h detection logic --- configure/os/CONFIG_SITE.Common.linux-arm | 5 ----- configure/os/CONFIG_SITE.Common.linux-microblaze | 4 ---- configure/os/CONFIG_SITE.Common.linux-x86 | 4 ---- configure/os/CONFIG_SITE.Common.linux-x86_64 | 4 ---- configure/os/CONFIG_SITE.Common.linux-xscale_be | 5 ----- 5 files changed, 22 deletions(-) diff --git a/configure/os/CONFIG_SITE.Common.linux-arm b/configure/os/CONFIG_SITE.Common.linux-arm index 90f792cde..3dc372497 100644 --- a/configure/os/CONFIG_SITE.Common.linux-arm +++ b/configure/os/CONFIG_SITE.Common.linux-arm @@ -15,11 +15,6 @@ # to inform the system of the shared library location. -# Use GNU Readline if the header file is installed -COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \ - $(firstword $(READLINE_DIR) $(GNU_DIR))/include/readline/readline.h), \ - READLINE, EPICS)) - # If libreadline needs additional libraries to be linked with it, try # uncommenting each of the lines below in turn, starting with the top # one and working downwards, until the build succeeds. Do a 'make rebuild' diff --git a/configure/os/CONFIG_SITE.Common.linux-microblaze b/configure/os/CONFIG_SITE.Common.linux-microblaze index b66b4cced..760ad6da6 100644 --- a/configure/os/CONFIG_SITE.Common.linux-microblaze +++ b/configure/os/CONFIG_SITE.Common.linux-microblaze @@ -12,10 +12,6 @@ GNU_DIR = /usr/local/vw/microblaze-2.0/microblazeel-unknown-linux-gnu -# Use GNU Readline if the header file is installed -COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \ - $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS)) - # If libreadline needs additional libraries to be linked with it, try # uncommenting each of the lines below in turn, starting with the top # one and working downwards, until the build succeeds. Do a 'make rebuild' diff --git a/configure/os/CONFIG_SITE.Common.linux-x86 b/configure/os/CONFIG_SITE.Common.linux-x86 index ae779c265..c0f50a37d 100644 --- a/configure/os/CONFIG_SITE.Common.linux-x86 +++ b/configure/os/CONFIG_SITE.Common.linux-x86 @@ -15,10 +15,6 @@ # to inform the system of the shared library location. -# Use GNU Readline if the header file is installed -COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \ - $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS)) - # If libreadline needs additional libraries to be linked with it, try # uncommenting each of the lines below in turn, starting with the top # one and working downwards, until the build succeeds. Do a 'make rebuild' diff --git a/configure/os/CONFIG_SITE.Common.linux-x86_64 b/configure/os/CONFIG_SITE.Common.linux-x86_64 index e098b7601..b98385f16 100644 --- a/configure/os/CONFIG_SITE.Common.linux-x86_64 +++ b/configure/os/CONFIG_SITE.Common.linux-x86_64 @@ -15,10 +15,6 @@ # to inform the system of the shared library location. -# Use GNU Readline if the header file is installed -COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \ - $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS)) - # If libreadline needs additional libraries to be linked with it, try # uncommenting each of the lines below in turn, starting with the top # one and working downwards, until the build succeeds. Do a 'make rebuild' diff --git a/configure/os/CONFIG_SITE.Common.linux-xscale_be b/configure/os/CONFIG_SITE.Common.linux-xscale_be index 5fb5a4642..2905b88ba 100644 --- a/configure/os/CONFIG_SITE.Common.linux-xscale_be +++ b/configure/os/CONFIG_SITE.Common.linux-xscale_be @@ -3,11 +3,6 @@ # Site-specific settings for the linux-xscale_be target -# Use GNU Readline if the header file is installed -COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \ - $(firstword $(READLINE_DIR) $(GNU_DIR))/include/readline/readline.h), \ - READLINE, EPICS)) - # If libreadline needs additional libraries to be linked with it, try # uncommenting each of the lines below in turn, starting with the top # one and working downwards, until the build succeeds. Do a 'make rebuild'