From 33ecfcb6bc361c7930fc6f7880a4e9b356f1d1ba Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 23 Dec 2022 12:47:43 +0100 Subject: [PATCH] drop support for SL6 and 32 bit Windows --- configure/os/CONFIG.Common.SL6-x86 | 7 ------- configure/os/CONFIG.Common.SL6-x86_64 | 5 ----- configure/os/CONFIG.Common.SL6-x86_64-clang | 1 - configure/os/CONFIG.Linux.win32-x86 | 4 ---- configure/os/CONFIG.RHEL7-x86_64.SL6-x86 | 6 ------ configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64 | 16 ---------------- configure/os/CONFIG.RHEL7-x86_64.win32-x86 | 1 - configure/os/CONFIG.RHEL8-x86_64.win32-x86 | 1 - configure/os/CONFIG.SL6-x86.Common | 2 -- configure/os/CONFIG.SL6-x86.SL6-x86 | 2 -- configure/os/CONFIG.SL6-x86_64.Common | 3 --- configure/os/CONFIG.SL6-x86_64.SL6-x86 | 2 -- configure/os/CONFIG.SL6-x86_64.SL6-x86_64 | 2 -- configure/os/CONFIG_SITE.RHEL7-x86_64.Common | 8 -------- configure/os/CONFIG_SITE.SL6-x86.Common | 1 - configure/os/CONFIG_SITE.SL6-x86_64.Common | 7 ------- configure/os/CONFIG_SITE.linux-x86_64.Common | 2 +- 17 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 configure/os/CONFIG.Common.SL6-x86 delete mode 100644 configure/os/CONFIG.Common.SL6-x86_64 delete mode 100644 configure/os/CONFIG.Common.SL6-x86_64-clang delete mode 100644 configure/os/CONFIG.Linux.win32-x86 delete mode 100644 configure/os/CONFIG.RHEL7-x86_64.SL6-x86 delete mode 100644 configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64 delete mode 100644 configure/os/CONFIG.RHEL7-x86_64.win32-x86 delete mode 100644 configure/os/CONFIG.RHEL8-x86_64.win32-x86 delete mode 100644 configure/os/CONFIG.SL6-x86.Common delete mode 100644 configure/os/CONFIG.SL6-x86.SL6-x86 delete mode 100644 configure/os/CONFIG.SL6-x86_64.Common delete mode 100644 configure/os/CONFIG.SL6-x86_64.SL6-x86 delete mode 100644 configure/os/CONFIG.SL6-x86_64.SL6-x86_64 delete mode 100644 configure/os/CONFIG_SITE.SL6-x86.Common delete mode 100644 configure/os/CONFIG_SITE.SL6-x86_64.Common diff --git a/configure/os/CONFIG.Common.SL6-x86 b/configure/os/CONFIG.Common.SL6-x86 deleted file mode 100644 index 72b37b20a..000000000 --- a/configure/os/CONFIG.Common.SL6-x86 +++ /dev/null @@ -1,7 +0,0 @@ -# Include definitions common to linux pentium targets -include $(CONFIG)/os/CONFIG.Common.linux-x86 - -ARCH_DEP_CFLAGS += -march=i686 - -# have no full C++11 -STD_CXXFLAGS = -std=c++0x diff --git a/configure/os/CONFIG.Common.SL6-x86_64 b/configure/os/CONFIG.Common.SL6-x86_64 deleted file mode 100644 index a0c6604bc..000000000 --- a/configure/os/CONFIG.Common.SL6-x86_64 +++ /dev/null @@ -1,5 +0,0 @@ -# Include definitions common to linux pentium targets -include $(CONFIG)/os/CONFIG.Common.linux-x86_64 - -# have no full C++11 -STD_CXXFLAGS = -std=c++0x diff --git a/configure/os/CONFIG.Common.SL6-x86_64-clang b/configure/os/CONFIG.Common.SL6-x86_64-clang deleted file mode 100644 index fa50b4f9c..000000000 --- a/configure/os/CONFIG.Common.SL6-x86_64-clang +++ /dev/null @@ -1 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.linux-clang diff --git a/configure/os/CONFIG.Linux.win32-x86 b/configure/os/CONFIG.Linux.win32-x86 deleted file mode 100644 index 8e229ac11..000000000 --- a/configure/os/CONFIG.Linux.win32-x86 +++ /dev/null @@ -1,4 +0,0 @@ -include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 - -PATH := /opt/wine-msvc-2017/bin/x86:$(PATH) -export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH) diff --git a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86 b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86 deleted file mode 100644 index d0fa4a06c..000000000 --- a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86 +++ /dev/null @@ -1,6 +0,0 @@ -# "cross compile" for older Linux version (32 bit) -# It was neccessary to install 32 bit compatibility libraries manually -#------------------------------------------------------- - -include $(CONFIG)/os/CONFIG.RHEL7-x86_64.SL6-x86_64 -TARGET_LDFLAGS = -B /usr/lib/x86_64-redhat-linux6E/lib diff --git a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64 b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64 deleted file mode 100644 index ae9c9ea95..000000000 --- a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64 +++ /dev/null @@ -1,16 +0,0 @@ -# "cross compile" for older Linux version -# Use older compiler and older libraries -# Used packages: -# compat-gcc-44-c++-4.4.7 -# compat-gcc-44-4.4.7 -# compat-glibc-headers-2.12 -# compat-glibc-2.12 -#------------------------------------------------------- - -include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 -CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44 -CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44 - -TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include -TARGET_LDFLAGS = -B /usr/lib/x86_64-redhat-linux6E/lib64 -LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo diff --git a/configure/os/CONFIG.RHEL7-x86_64.win32-x86 b/configure/os/CONFIG.RHEL7-x86_64.win32-x86 deleted file mode 100644 index 22830f6c2..000000000 --- a/configure/os/CONFIG.RHEL7-x86_64.win32-x86 +++ /dev/null @@ -1 +0,0 @@ -include $(CONFIG)/os/CONFIG.Linux.win32-x86 diff --git a/configure/os/CONFIG.RHEL8-x86_64.win32-x86 b/configure/os/CONFIG.RHEL8-x86_64.win32-x86 deleted file mode 100644 index 22830f6c2..000000000 --- a/configure/os/CONFIG.RHEL8-x86_64.win32-x86 +++ /dev/null @@ -1 +0,0 @@ -include $(CONFIG)/os/CONFIG.Linux.win32-x86 diff --git a/configure/os/CONFIG.SL6-x86.Common b/configure/os/CONFIG.SL6-x86.Common deleted file mode 100644 index 183caedd7..000000000 --- a/configure/os/CONFIG.SL6-x86.Common +++ /dev/null @@ -1,2 +0,0 @@ -#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system -#Include definitions common to linux hosts diff --git a/configure/os/CONFIG.SL6-x86.SL6-x86 b/configure/os/CONFIG.SL6-x86.SL6-x86 deleted file mode 100644 index 2bf7aace1..000000000 --- a/configure/os/CONFIG.SL6-x86.SL6-x86 +++ /dev/null @@ -1,2 +0,0 @@ -# Include common linux definitions -include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG.SL6-x86_64.Common b/configure/os/CONFIG.SL6-x86_64.Common deleted file mode 100644 index 26c65b727..000000000 --- a/configure/os/CONFIG.SL6-x86_64.Common +++ /dev/null @@ -1,3 +0,0 @@ -#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system -#Include definitions common to linux hosts -include $(CONFIG)/os/CONFIG.linux-x86_64.Common diff --git a/configure/os/CONFIG.SL6-x86_64.SL6-x86 b/configure/os/CONFIG.SL6-x86_64.SL6-x86 deleted file mode 100644 index 2bf7aace1..000000000 --- a/configure/os/CONFIG.SL6-x86_64.SL6-x86 +++ /dev/null @@ -1,2 +0,0 @@ -# Include common linux definitions -include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG.SL6-x86_64.SL6-x86_64 b/configure/os/CONFIG.SL6-x86_64.SL6-x86_64 deleted file mode 100644 index 2bf7aace1..000000000 --- a/configure/os/CONFIG.SL6-x86_64.SL6-x86_64 +++ /dev/null @@ -1,2 +0,0 @@ -# Include common linux definitions -include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common index bcbbd5880..896aa1645 100644 --- a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common @@ -4,14 +4,6 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang -# Build for old SL6 64 bit -CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64 -CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86_64 - -# Build for old SL6 32 bit -CROSS_COMPILER_TARGET_ARCHS += SL6-x86 -CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86 - # NI Linux Real-Time 7.x # requires RPM gcc-c++-arm-linux-gnu # Not available on RHEL8 diff --git a/configure/os/CONFIG_SITE.SL6-x86.Common b/configure/os/CONFIG_SITE.SL6-x86.Common deleted file mode 100644 index 332cebc34..000000000 --- a/configure/os/CONFIG_SITE.SL6-x86.Common +++ /dev/null @@ -1 +0,0 @@ -include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common diff --git a/configure/os/CONFIG_SITE.SL6-x86_64.Common b/configure/os/CONFIG_SITE.SL6-x86_64.Common deleted file mode 100644 index 9922d98ca..000000000 --- a/configure/os/CONFIG_SITE.SL6-x86_64.Common +++ /dev/null @@ -1,7 +0,0 @@ -# Build 32 bit version as a cross architecture -#CROSS_COMPILER_TARGET_ARCHS += SL6-x86 - -# Improved error checking with clang -#CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64-clang - -include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common diff --git a/configure/os/CONFIG_SITE.linux-x86_64.Common b/configure/os/CONFIG_SITE.linux-x86_64.Common index 9bee46bb0..d06df5dcf 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.Common +++ b/configure/os/CONFIG_SITE.linux-x86_64.Common @@ -12,7 +12,7 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common GNU_HOST_ARCH_64=x86_64 # Windows cross builds using Wine -CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64 +CROSS_COMPILER_TARGET_ARCHS += windows-x64 # IOxOS IFC1211 CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64