Move riscv64 lp64d symlink to filesystem package

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2024-11-30 15:02:05 +02:00
parent 176969ead3
commit 80e2ed7c86
Signed by: davidlt
GPG Key ID: 7A5F42FAF91FACC3

View File

@ -153,7 +153,7 @@ Version: %{glibcversion}
# generator to make the generated requires interchangeable between Rawhide
# and ELN (.elnYY < .fcXX).
%global baserelease 21
Release: %{baserelease}%{?dist}
Release: %{baserelease}.0.riscv64%{?dist}
# Licenses:
#
@ -1428,17 +1428,6 @@ for d in $usrmove_file_names ; do
ln -s "usr/$d" "%{glibc_sysroot}/$d"
done
%ifarch riscv64
# RISC-V ABI wants to install everything in /usr/lib64/lp64d.
# Make these be symlinks to /usr/lib64. See:
# Make these be symlinks to /lib64 or /usr/lib64 respectively. See:
# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/DRHT5YTPK4WWVGL3GIN5BF2IKX2ODHZ3/
for d in %{glibc_sysroot}%{_libdir}; do
mkdir -p $d
(cd $d && ln -sf . lp64d)
done
%endif
%ifarch x86_64
# Install for the glibc32 package.
pushd build-%{target}-32
@ -1785,10 +1774,6 @@ for lib in lib lib64; do
set +x
slbase=$(basename $sl)
sltarget=$(basename $(readlink $sl))
if test "$sltarget" = . ; then
# This is the lp64d symbolic link on riscv64, see above.
continue
fi
if ! test -r usr/$lib/$sltarget; then
echo "$sl: inferred $sltarget ($(readlink $sl)) missing"
exit 1
@ -2358,6 +2343,9 @@ update_gconv_modules_cache ()
%endif
%changelog
* Sat Nov 30 2024 David Abdurachmanov <davidlt@rivosinc.com> - 2.40.9000-21.0.riscv64
- Move riscv64 lp64d symlink to filesystem package
* Fri Nov 29 2024 Florian Weimer <fweimer@redhat.com> - 2.40.9000-21
- Drop glibc-rh2327564-1.patch, glibc-rh2327564-2.patch. Fixed upstream.
(#2327564)