add more loongarch64 and adjust aarch64 libdir

This commit is contained in:
Alexander Stefanov 2024-08-22 12:46:52 +00:00
parent c526453d8f
commit de6bf71ce9

View file

@ -509,6 +509,9 @@ if st.type ~= "link" then
%endif %endif
%ifarch riscv64 %ifarch riscv64
posix.symlink("%{_libdir}/ld-linux-riscv64-lp64d.so.1", "/%{_lib}/ld-linux-riscv64-lp64d.so.1") posix.symlink("%{_libdir}/ld-linux-riscv64-lp64d.so.1", "/%{_lib}/ld-linux-riscv64-lp64d.so.1")
%endif
%ifarch loongarch64
posix.symlink("%{_libdir}/ld-linux-loongarch-lp64d.so.1", "/%{_lib}/ld-linux-loongarch-lp64d.so.1")
%endif %endif
posix.symlink("%{_bindir}/ldconfig", "/usr/sbin/ldconfig") posix.symlink("%{_bindir}/ldconfig", "/usr/sbin/ldconfig")
end end
@ -788,6 +791,11 @@ LANG variable to their preferred language in their
/lib/ld-linux-riscv64-lp64d.so.1 /lib/ld-linux-riscv64-lp64d.so.1
%{_libdir}/lp64d %{_libdir}/lp64d
%endif %endif
%if %isarch loongarch64
%{_libdir}/ld-linux-loongarch-lp64d.so.1
/lib/ld-linux-loongarch-lp64d.so.1
%{_libdir}/lp64d
%endif
%{_libdir}/lib*.so.[0-9]* %{_libdir}/lib*.so.[0-9]*
%if "%{name}" == "glibc" %if "%{name}" == "glibc"
%dir %{_libdir}/audit %dir %{_libdir}/audit
@ -1198,7 +1206,7 @@ find . -type f -size 0 -o -name "*.orig" -exec rm {} \;
# Regenerate autoconf files, some of our patches touch them # Regenerate autoconf files, some of our patches touch them
# Remove the autoconf 2.69 hardcode... # Remove the autoconf 2.69 hardcode...
sed -e "s,2.69,$(autoconf --version |head -n1 |cut -d' ' -f4)," -i aclocal.m4 sed -e "s,2.71,$(autoconf --version |head -n1 |cut -d' ' -f4)," -i aclocal.m4
# fix nss headers location # fix nss headers location
sed -e 's@<hasht.h>@<nss/hasht.h>@g' -e 's@<nsslowhash.h>@<nss/nsslowhash.h>@g' -i configure* sed -e 's@<hasht.h>@<nss/hasht.h>@g' -e 's@<nsslowhash.h>@<nss/nsslowhash.h>@g' -i configure*
@ -1927,7 +1935,7 @@ rm -f %{buildroot}%{_prefix}/lib/libcrypt.so
# Compat symlink -- some versions of ld hardcoded /lib/ld-linux-aarch64.so.1 # Compat symlink -- some versions of ld hardcoded /lib/ld-linux-aarch64.so.1
# as dynamic loader (probably die to ABI spec saying this) # as dynamic loader (probably die to ABI spec saying this)
mkdir -p %{buildroot}/lib mkdir -p %{buildroot}/lib
ln -s /lib64/ld-linux-aarch64.so.1 %{buildroot}/lib/ld-linux-aarch64.so.1 ln -s %{_libdir}/ld-linux-aarch64.so.1 %{buildroot}/lib/ld-linux-aarch64.so.1
%endif %endif
%ifarch riscv64 %ifarch riscv64
@ -1942,6 +1950,11 @@ mkdir -p %{buildroot}/lib
ln -s %{_libdir}/ld-linux-riscv64-lp64d.so.1 %{buildroot}/lib/ld-linux-riscv64-lp64d.so.1 ln -s %{_libdir}/ld-linux-riscv64-lp64d.so.1 %{buildroot}/lib/ld-linux-riscv64-lp64d.so.1
%endif %endif
%ifarch loongarch64
mkdir -p %{buildroot}/lib
ln -s %{_libdir}/ld-linux-riscv64-lp64d.so.1 %{buildroot}/lib/ld-linux-riscv64-lp64d.so.1
%endif
%ifarch %{x86_64} %ifarch %{x86_64}
# Needed for bootstrapping x32 compilers # Needed for bootstrapping x32 compilers
[ -e %{buildroot}%{_includedir}/gnu/stubs-x32.h ] || cp %{buildroot}%{_includedir}/gnu/stubs-64.h %{buildroot}%{_includedir}/gnu/stubs-x32.h [ -e %{buildroot}%{_includedir}/gnu/stubs-x32.h ] || cp %{buildroot}%{_includedir}/gnu/stubs-64.h %{buildroot}%{_includedir}/gnu/stubs-x32.h