diff --git a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common index f085678b5..244520f20 100644 --- a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common @@ -4,4 +4,4 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang # Build for old RHEL7 64 bit -CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64 +#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64 diff --git a/configure/os/CONFIG_SITE.RHEL9-x86_64.Common b/configure/os/CONFIG_SITE.RHEL9-x86_64.Common index ad5296dfc..5fd9ce935 100644 --- a/configure/os/CONFIG_SITE.RHEL9-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL9-x86_64.Common @@ -7,4 +7,4 @@ CROSS_COMPILER_TARGET_ARCHS += RHEL9-x86_64-clang CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64 # Build for old RHEL7 64 bit -CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64 +#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64 diff --git a/epics-base.spec b/epics-base.spec index 4efb912bc..9606b389f 100644 --- a/epics-base.spec +++ b/epics-base.spec @@ -54,11 +54,6 @@ Summary: Minimal stuff needed to build EPICS host apps Requires: %{name} = %{version}-%{release} # This EPICS installation uses the toolset 12 compiler -%if 0%{?rhel} == 7 -Requires: devtoolset-12-gcc-c++ -BuildRequires: devtoolset-12-gcc-c++ -%endif - %if 0%{?rhel} >= 8 Requires: gcc-toolset-12-gcc-c++ BuildRequires: gcc-toolset-12-gcc-c++ @@ -67,11 +62,8 @@ BuildRequires: gcc-toolset-12-gcc-c++ # The perl stuff we need Requires: perl-interpreter >= 5.10.1 BuildRequires: perl-interpreter >= 5.10.1 - -%if 0%{?rhel} >= 7 Requires: perl-File-Path perl-Getopt-Long perl-Pod-Usage perl-Time-HiRes perl-Data-Dumper perl-Scalar-List-Utils BuildRequires: perl-File-Path perl-Getopt-Long perl-Pod-Usage perl-Time-HiRes perl-Data-Dumper perl-Scalar-List-Utils -%endif %if 0%{?rhel} >= 8 Requires: perl-Text-Tabs+Wrap @@ -92,13 +84,15 @@ Contains headers etc to build EPICS host applications. ########################################### +%if %{?rhel} > 8 %package compat -Summary: EPICS base %{EpicsVersion} for other RHEL versions +Summary: EPICS base %{EpicsVersion} for older RHEL versions Requires: %{name} = %{version}-%{release} AutoReqProv: no %description compat -Contains EPICS binaries that run on other RHEL versions. +Contains EPICS binaries that run on older RHEL versions. +%endif ########################################### @@ -208,11 +202,7 @@ shopt -s extglob /bin/sed 's!\$EPICS_BASE!%{prog_folder}!' epics-base.sh > %{buildroot}%{prog_folder}/bin/epics-base.sh # copy over old libraries for compatibility -%if %{?rhel} > 7 -%{__cp} /opt/RHEL7/lib64/libreadline.so.6 %{buildroot}%{prog_folder}/lib/RHEL7-x86_64 -%endif %if %{?rhel} > 8 -%{__cp} /opt/RHEL7/lib64/libtinfo.so.5 %{buildroot}%{prog_folder}/lib/RHEL7-x86_64 %{__cp} /opt/RHEL8/lib64/libreadline.so.7 %{buildroot}%{prog_folder}/lib/RHEL8-x86_64 %endif @@ -300,24 +290,15 @@ fi ########################################### -%files compat -%if %{?rhel} > 7 -%dir %{prog_folder}/bin/RHEL7* -%{prog_folder}/bin/RHEL7*/[Scips]*[^.]?? -%{prog_folder}/bin/RHEL7*/p2p -%{prog_folder}/bin/RHEL7*/msi -%dir %{prog_folder}/lib/RHEL7* -%{prog_folder}/lib/RHEL7*/*.so* -%endif - %if %{?rhel} > 8 + +%files compat %dir %{prog_folder}/bin/RHEL8* %{prog_folder}/bin/RHEL8*/[Scips]*[^.]?? %{prog_folder}/bin/RHEL8*/p2p %{prog_folder}/bin/RHEL8*/msi %dir %{prog_folder}/lib/RHEL8* %{prog_folder}/lib/RHEL8*/*.so* -%endif %if %{?rhel} > 9 %dir %{prog_folder}/bin/RHEL9* @@ -328,6 +309,8 @@ fi %{prog_folder}/lib/RHEL9*/*.so* %endif +%endif + ########################################### %files wine