From a40737c06b3ff3dc8c0a2f0a03cbaca8a35db46e Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Wed, 7 Apr 2021 13:54:19 +0200 Subject: [PATCH] Add RHEL8 support --- configure/os/CONFIG.Common.RHEL8-x86_64 | 2 ++ configure/os/CONFIG.Common.RHEL8-x86_64-clang | 1 + configure/os/CONFIG.RHEL8-x86_64.Common | 3 +++ configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 | 2 ++ configure/os/CONFIG.RHEL8-x86_64.win32-x86 | 8 ++++++++ configure/os/CONFIG.RHEL8-x86_64.windows-x64 | 8 ++++++++ configure/os/CONFIG_SITE.RHEL8-x86_64.Common | 18 ++++++++++++++++++ 7 files changed, 42 insertions(+) create mode 100644 configure/os/CONFIG.Common.RHEL8-x86_64 create mode 100644 configure/os/CONFIG.Common.RHEL8-x86_64-clang create mode 100644 configure/os/CONFIG.RHEL8-x86_64.Common create mode 100644 configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 create mode 100644 configure/os/CONFIG.RHEL8-x86_64.win32-x86 create mode 100644 configure/os/CONFIG.RHEL8-x86_64.windows-x64 create mode 100644 configure/os/CONFIG_SITE.RHEL8-x86_64.Common diff --git a/configure/os/CONFIG.Common.RHEL8-x86_64 b/configure/os/CONFIG.Common.RHEL8-x86_64 new file mode 100644 index 000000000..757bcb323 --- /dev/null +++ b/configure/os/CONFIG.Common.RHEL8-x86_64 @@ -0,0 +1,2 @@ +# Include definitions common to linux pentium targets +include $(CONFIG)/os/CONFIG.Common.linux-x86_64 diff --git a/configure/os/CONFIG.Common.RHEL8-x86_64-clang b/configure/os/CONFIG.Common.RHEL8-x86_64-clang new file mode 100644 index 000000000..fa50b4f9c --- /dev/null +++ b/configure/os/CONFIG.Common.RHEL8-x86_64-clang @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG.Common.linux-clang diff --git a/configure/os/CONFIG.RHEL8-x86_64.Common b/configure/os/CONFIG.RHEL8-x86_64.Common new file mode 100644 index 000000000..26c65b727 --- /dev/null +++ b/configure/os/CONFIG.RHEL8-x86_64.Common @@ -0,0 +1,3 @@ +#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.RHEL8-x86_64.RHEL8-x86_64 b/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 new file mode 100644 index 000000000..2bf7aace1 --- /dev/null +++ b/configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64 @@ -0,0 +1,2 @@ +# Include common linux definitions +include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG.RHEL8-x86_64.win32-x86 b/configure/os/CONFIG.RHEL8-x86_64.win32-x86 new file mode 100644 index 000000000..93b0b79bc --- /dev/null +++ b/configure/os/CONFIG.RHEL8-x86_64.win32-x86 @@ -0,0 +1,8 @@ +include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 + +PATH_FILTER = $(subst /,/,$(1)) + +# Silence the tr1 namespace deprecation warnings +USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING + +MSVC_DIR = /opt/wine-msvc-2017/bin/x86/ diff --git a/configure/os/CONFIG.RHEL8-x86_64.windows-x64 b/configure/os/CONFIG.RHEL8-x86_64.windows-x64 new file mode 100644 index 000000000..8ea1a5ee5 --- /dev/null +++ b/configure/os/CONFIG.RHEL8-x86_64.windows-x64 @@ -0,0 +1,8 @@ +include $(CONFIG)/os/CONFIG.windows-x64.windows-x64 + +PATH_FILTER = $(subst /,/,$(1)) + +# Silence the tr1 namespace deprecation warnings +USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING + +MSVC_DIR = /opt/wine-msvc-2017/bin/x64/ diff --git a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common new file mode 100644 index 000000000..d84ee4cca --- /dev/null +++ b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common @@ -0,0 +1,18 @@ +include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common + +# Improved error checking with clang +CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang + +# Build for old SL6 64 bit +#CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64 + +# Build for old SL6 32 bit +#CROSS_COMPILER_TARGET_ARCHS += SL6-x86 + +# NI Linux Real-Time 7.x +# requires RPM gcc-c++-arm-linux-gnu +# not available yet for RHEL8 +#CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a + +# Windows cross builds using Wine +CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64