From 8edcd7b07fc4e15d18075905770b271257bdae31 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 9 Aug 2019 16:20:14 +0200 Subject: [PATCH] use READLINE as default for all Linux systems --- configure/os/CONFIG.Common.RHEL7-x86_64 | 2 -- configure/os/CONFIG.Common.RHEL7-x86_64-clang | 2 -- configure/os/CONFIG.Common.SL6-x86 | 2 -- configure/os/CONFIG.Common.SL6-x86_64 | 2 -- configure/os/CONFIG.Common.SL6-x86_64-clang | 2 -- configure/os/CONFIG.Common.eldk51-ppc4xxSF | 2 -- configure/os/CONFIG.Common.eldk52-e500v2 | 2 -- configure/os/CONFIG.Common.eldk53-ppc4xxFP | 2 -- configure/os/CONFIG.Common.fslqoriq20-e6500_64 | 2 -- configure/os/CONFIG.Common.raspbian-arm | 2 -- configure/os/CONFIG.Common.yocto21-aarch64 | 2 -- configure/os/CONFIG_SITE.Common.linuxCommon | 1 + 12 files changed, 1 insertion(+), 22 deletions(-) create mode 100644 configure/os/CONFIG_SITE.Common.linuxCommon diff --git a/configure/os/CONFIG.Common.RHEL7-x86_64 b/configure/os/CONFIG.Common.RHEL7-x86_64 index c80ad3be3..401de96c7 100644 --- a/configure/os/CONFIG.Common.RHEL7-x86_64 +++ b/configure/os/CONFIG.Common.RHEL7-x86_64 @@ -1,6 +1,4 @@ # Include definitions common to linux pentium targets include $(CONFIG)/os/CONFIG.Common.linux-x86_64 -COMMANDLINE_LIBRARY = READLINE - ARCH_DEP_CXXFLAGS += -fno-strict-aliasing diff --git a/configure/os/CONFIG.Common.RHEL7-x86_64-clang b/configure/os/CONFIG.Common.RHEL7-x86_64-clang index 57f57aa53..fa50b4f9c 100644 --- a/configure/os/CONFIG.Common.RHEL7-x86_64-clang +++ b/configure/os/CONFIG.Common.RHEL7-x86_64-clang @@ -1,3 +1 @@ include $(CONFIG)/os/CONFIG.Common.linux-clang - -COMMANDLINE_LIBRARY = READLINE diff --git a/configure/os/CONFIG.Common.SL6-x86 b/configure/os/CONFIG.Common.SL6-x86 index 1c37ff7e8..ddd3bc7d5 100644 --- a/configure/os/CONFIG.Common.SL6-x86 +++ b/configure/os/CONFIG.Common.SL6-x86 @@ -1,8 +1,6 @@ # Include definitions common to linux pentium targets include $(CONFIG)/os/CONFIG.Common.linux-x86 -COMMANDLINE_LIBRARY = READLINE - ARCH_DEP_CFLAGS += -march=i686 # remove warning in anyscalar.h diff --git a/configure/os/CONFIG.Common.SL6-x86_64 b/configure/os/CONFIG.Common.SL6-x86_64 index 3f94be38d..80018a4c6 100644 --- a/configure/os/CONFIG.Common.SL6-x86_64 +++ b/configure/os/CONFIG.Common.SL6-x86_64 @@ -1,7 +1,5 @@ # Include definitions common to linux pentium targets include $(CONFIG)/os/CONFIG.Common.linux-x86_64 -COMMANDLINE_LIBRARY = READLINE - # remove warning in anyscalar.h ARCH_DEP_CXXFLAGS += -fno-strict-aliasing diff --git a/configure/os/CONFIG.Common.SL6-x86_64-clang b/configure/os/CONFIG.Common.SL6-x86_64-clang index 57f57aa53..fa50b4f9c 100644 --- a/configure/os/CONFIG.Common.SL6-x86_64-clang +++ b/configure/os/CONFIG.Common.SL6-x86_64-clang @@ -1,3 +1 @@ include $(CONFIG)/os/CONFIG.Common.linux-clang - -COMMANDLINE_LIBRARY = READLINE diff --git a/configure/os/CONFIG.Common.eldk51-ppc4xxSF b/configure/os/CONFIG.Common.eldk51-ppc4xxSF index 276e5b99e..48b3e7e3b 100644 --- a/configure/os/CONFIG.Common.eldk51-ppc4xxSF +++ b/configure/os/CONFIG.Common.eldk51-ppc4xxSF @@ -3,8 +3,6 @@ # Include definitions common to all Linux targets include $(CONFIG)/os/CONFIG.Common.linuxCommon -COMMANDLINE_LIBRARY = READLINE - ARCH_CLASS = ppc SDK = eldk diff --git a/configure/os/CONFIG.Common.eldk52-e500v2 b/configure/os/CONFIG.Common.eldk52-e500v2 index fc6e21e9e..ff1d5ffd6 100644 --- a/configure/os/CONFIG.Common.eldk52-e500v2 +++ b/configure/os/CONFIG.Common.eldk52-e500v2 @@ -3,8 +3,6 @@ # Include definitions common to all Linux targets include $(CONFIG)/os/CONFIG.Common.linuxCommon -COMMANDLINE_LIBRARY = READLINE - ARCH_CLASS = ppc SDK = eldk diff --git a/configure/os/CONFIG.Common.eldk53-ppc4xxFP b/configure/os/CONFIG.Common.eldk53-ppc4xxFP index e45aa16a4..d42226e2b 100644 --- a/configure/os/CONFIG.Common.eldk53-ppc4xxFP +++ b/configure/os/CONFIG.Common.eldk53-ppc4xxFP @@ -3,8 +3,6 @@ # Include definitions common to all Linux targets include $(CONFIG)/os/CONFIG.Common.linuxCommon -COMMANDLINE_LIBRARY = READLINE - ARCH_CLASS = ppc SDK = eldk diff --git a/configure/os/CONFIG.Common.fslqoriq20-e6500_64 b/configure/os/CONFIG.Common.fslqoriq20-e6500_64 index 7c2a615d2..0128312ce 100644 --- a/configure/os/CONFIG.Common.fslqoriq20-e6500_64 +++ b/configure/os/CONFIG.Common.fslqoriq20-e6500_64 @@ -3,8 +3,6 @@ # Include definitions common to all Linux targets include $(CONFIG)/os/CONFIG.Common.linuxCommon -COMMANDLINE_LIBRARY = READLINE - ARCH_CLASS = ppc SDK = fslsdk diff --git a/configure/os/CONFIG.Common.raspbian-arm b/configure/os/CONFIG.Common.raspbian-arm index 3d5f31d6c..6c69dcfe7 100644 --- a/configure/os/CONFIG.Common.raspbian-arm +++ b/configure/os/CONFIG.Common.raspbian-arm @@ -18,8 +18,6 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon # Also copy /usr/include/readline/ directory from some readline 6 installation # to $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/usr/include/ -COMMANDLINE_LIBRARY = READLINE - ARCH_CLASS = arm SDK_DIR = /opt/raspberrypi/arm-bcm2708 diff --git a/configure/os/CONFIG.Common.yocto21-aarch64 b/configure/os/CONFIG.Common.yocto21-aarch64 index 417e11a4c..7a06651ef 100644 --- a/configure/os/CONFIG.Common.yocto21-aarch64 +++ b/configure/os/CONFIG.Common.yocto21-aarch64 @@ -3,8 +3,6 @@ # Include definitions common to all Linux targets include $(CONFIG)/os/CONFIG.Common.linuxCommon -COMMANDLINE_LIBRARY = READLINE - ARCH_CLASS = arm64 SDK = petalinux diff --git a/configure/os/CONFIG_SITE.Common.linuxCommon b/configure/os/CONFIG_SITE.Common.linuxCommon new file mode 100644 index 000000000..30cfd903b --- /dev/null +++ b/configure/os/CONFIG_SITE.Common.linuxCommon @@ -0,0 +1 @@ +COMMANDLINE_LIBRARY = READLINE