better fix for old libraries of compat mode

This commit is contained in:
zimoch committed 2026-10-07 17:01:34 +02:00
1 parent c6d4828aaa
commit 164f920e9f
3 files changed
+9 -8

No files matched your search

@@ -21,5 +21,6 @@ CPPFLAGS += $(WRAPPER)
AR = ar -rc
RANLIB = ranlib
# Allow to run cross-tests which expect different lib versions
export LD_PRELOAD=$(SYSROOT)/lib64/libreadline.so
# Allow RHEL8 EPICS programs to find older libraries
# --disable-new-dtags extends -rpath to indirect depencencies
LDFLAGS += -Wl,--disable-new-dtags -Wl,-rpath=/lib64:$(SYSROOT)/lib64 -Wl,-rpath-link,$(SYSROOT)/lib64
@@ -20,3 +20,7 @@ TARGET_CPPFLAGS += $(WRAPPER)
# But but our host versions work just fine.
AR = ar -rc
RANLIB = ranlib
# Allow RHEL8 EPICS programs to find older libraries
# --disable-new-dtags extends -rpath to indirect depencencies
LDFLAGS += -Wl,--disable-new-dtags -Wl,-rpath=/lib64:$(SYSROOT)/lib64 -Wl,-rpath-link,$(SYSROOT)/lib64
+2 -6
View File
@@ -86,6 +86,7 @@ Contains headers etc to build EPICS host applications.
%package compat
Summary: EPICS base %{EpicsVersion} for older RHEL versions
Requires: %{name} = %{version}-%{release}
Requires: gfa-cross-compiler-links
AutoReqProv: no
%description compat
@@ -224,13 +225,8 @@ shopt -s extglob
/bin/sed 's!@EPICS_BASE@!%{prog_folder}!g;s!@EPICS_HOST_ARCH@!%{epics_host_arch}!g' epics-base.sh > %{buildroot}%{prog_folder}/bin/epics-base.sh
chmod +x %{buildroot}%{prog_folder}/bin/epics-base.sh
# copy over old libraries for compatibility
%if 0%{?rhel} > 8
%{__cp} /opt/RHEL8/lib64/libreadline.so.7 %{buildroot}%{prog_folder}/lib/RHEL8-x86_64
%endif
# Do not use install section because build already installed
# and install will delete our buildroot!
# and install would delete our buildroot!
%clean
%make_build INSTALL_LOCATION=%{buildroot}%{prog_folder} realclean