Relocations are no longer required.
sysboost no longer needs relocation, so we remove it. Signed-off-by: Ricardo <liutie4@huawei.com> (cherry picked from commit 99cd3216aaadd9fd81fd87d41fcc660dcfd87d1f)
This commit is contained in:
parent
d21689f44e
commit
6cb50f8b47
45
ncurses.spec
45
ncurses.spec
@ -1,15 +1,6 @@
|
|||||||
%if %{?openEuler:1}0
|
|
||||||
%global ENABLE_RELOC 0
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{ENABLE_RELOC}
|
|
||||||
%global ldflags_options -Wl,--emit-relocs
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
Name: ncurses
|
Name: ncurses
|
||||||
Version: 6.3
|
Version: 6.3
|
||||||
Release: 14
|
Release: 15
|
||||||
Summary: Terminal control library
|
Summary: Terminal control library
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://invisible-island.net/ncurses/ncurses.html
|
URL: https://invisible-island.net/ncurses/ncurses.html
|
||||||
@ -102,16 +93,6 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
This package contains development documentation, manuals
|
This package contains development documentation, manuals
|
||||||
for interface function, and related documents.
|
for interface function, and related documents.
|
||||||
|
|
||||||
%if %{?ENABLE_RELOC}
|
|
||||||
%package relocation
|
|
||||||
Summary: Relocations for %{name}
|
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
|
||||||
BuildRequires: sysboost-devel
|
|
||||||
|
|
||||||
%description relocation
|
|
||||||
Relocations for %{name}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n %{name}-%{version} -p1
|
||||||
|
|
||||||
@ -148,7 +129,7 @@ for abi in 5 6; do
|
|||||||
[ $abi = 5 ] && echo $abi5_options
|
[ $abi = 5 ] && echo $abi5_options
|
||||||
[ $char = widec ] && echo --enable-widec
|
[ $char = widec ] && echo --enable-widec
|
||||||
[ $progs = yes ] || echo --without-progs
|
[ $progs = yes ] || echo --without-progs
|
||||||
) LDFLAGS="%{?ldflags_options}"
|
)
|
||||||
|
|
||||||
make %{?_smp_mflags} libs
|
make %{?_smp_mflags} libs
|
||||||
[ $progs = yes ] && make %{?_smp_mflags} -C progs
|
[ $progs = yes ] && make %{?_smp_mflags} -C progs
|
||||||
@ -156,11 +137,6 @@ for abi in 5 6; do
|
|||||||
popd
|
popd
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
%if %{?ENABLE_RELOC}
|
|
||||||
objreloc widec6/lib/libtinfo.so.%{version}
|
|
||||||
mv -f widec6/lib/libtinfo.so.%{version}.relocation ${RPM_BUILD_DIR}/libtinfo.so.%{version}.relocation
|
|
||||||
rm -rf widec6/lib/libtinfo.so.%{version}.prim
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make -C narrowc5 DESTDIR=$RPM_BUILD_ROOT install.libs
|
make -C narrowc5 DESTDIR=$RPM_BUILD_ROOT install.libs
|
||||||
@ -170,12 +146,6 @@ make -C narrowc6 DESTDIR=$RPM_BUILD_ROOT install.libs
|
|||||||
rm ${RPM_BUILD_ROOT}%{_libdir}/lib{tic,tinfo}.so.6*
|
rm ${RPM_BUILD_ROOT}%{_libdir}/lib{tic,tinfo}.so.6*
|
||||||
make -C widec6 DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data,includes,man}
|
make -C widec6 DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data,includes,man}
|
||||||
|
|
||||||
%if %{?ENABLE_RELOC}
|
|
||||||
mkdir -p ${RPM_BUILD_ROOT}/usr/lib/relocation/%{_libdir}
|
|
||||||
mv ${RPM_BUILD_DIR}/libtinfo.so.%{version}.relocation ${RPM_BUILD_ROOT}/usr/lib/relocation/%{_libdir}libtinfo.so.%{version}.relocation
|
|
||||||
chmod 400 ${RPM_BUILD_ROOT}/usr/lib/relocation/%{_libdir}libtinfo.so.%{version}.relocation
|
|
||||||
%endif
|
|
||||||
|
|
||||||
chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
|
chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
|
||||||
chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
|
chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
|
||||||
|
|
||||||
@ -281,12 +251,13 @@ xz NEWS
|
|||||||
%{_mandir}/man5/*
|
%{_mandir}/man5/*
|
||||||
%{_mandir}/man7/*
|
%{_mandir}/man7/*
|
||||||
|
|
||||||
%if %{?ENABLE_RELOC}
|
|
||||||
%files relocation
|
|
||||||
/usr/lib/relocation/%{_libdir}libtinfo.so.%{version}.relocation
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 28 2024 liutie <liutie4@huawei.com> - 6.3-15
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:sysboost no longer needs relocation, so remove it.
|
||||||
|
|
||||||
* Tue Jan 30 2024 yanglu <yanglu72@h-partners.com> - 6.3-14
|
* Tue Jan 30 2024 yanglu <yanglu72@h-partners.com> - 6.3-14
|
||||||
- Type:CVE
|
- Type:CVE
|
||||||
- ID:CVE-2023-45918
|
- ID:CVE-2023-45918
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user