From 9337112a3d4ac79bef9d9ef8473b8f5b170b15a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Stelmach?= Date: Fri, 29 Jul 2022 11:07:54 +0200 Subject: [PATCH] packaging: Install libraries under ABI names MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit See 8208be389b ("Install shared objects under their ABI names") Change-Id: I97578a7747668da9b5755e80ab8cf1f75a974b24 Signed-off-by: Łukasz Stelmach --- packaging/glibc.spec | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/packaging/glibc.spec b/packaging/glibc.spec index e0a726b..e0da6bc 100644 --- a/packaging/glibc.spec +++ b/packaging/glibc.spec @@ -647,7 +647,7 @@ rm -rf %{buildroot}%{_datadir}/zoneinfo %ifarch armv7hl # Provide compatibility link -ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3 +ln -s ld-linux-armhf.so.3 %{buildroot}/lib/ld-linux.so.3 %endif # Move getconf to %{_libexecdir}/getconf/ to avoid cross device link @@ -715,72 +715,48 @@ done %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache %config(noreplace) /etc/rpc %verify(not md5 size mtime) %config(noreplace) /etc/gai.conf -/%{_lib}/ld-%{glibc_major_version}.so # Each architecture has a different name for the dynamic linker: %ifarch %arm %ifarch armv7hl -/%{_lib}/ld-linux-armhf.so.3 -# Keep compatibility link -/%{_lib}/ld-linux.so.3 -%else -/%{_lib}/ld-linux.so.3 +/lib/ld-linux-armhf.so.3 %endif +# Keep as compatibility link for armv7lh +/lib/ld-linux.so.3 %endif %ifarch x86_64 -/%{_lib}/ld-linux-x86-64.so.2 +/lib64/ld-linux-x86-64.so.2 %endif %ifarch %ix86 %sparc -/%{_lib}/ld-linux.so.2 +/lib/ld-linux.so.2 %endif %ifarch aarch64 /lib/ld-linux-aarch64.so.1 -/%{_lib}/ld-linux-aarch64.so.1 %endif -/%{_lib}/libanl-%{glibc_major_version}.so /%{_lib}/libanl.so.1 -/%{_lib}/libc-%{glibc_major_version}.so /%{_lib}/libc.so.6* -/%{_lib}/libcrypt-%{glibc_major_version}.so /%{_lib}/libcrypt.so.1 -/%{_lib}/libdl-%{glibc_major_version}.so /%{_lib}/libdl.so.2* -/%{_lib}/libm-%{glibc_major_version}.so /%{_lib}/libm.so.6* -/%{_lib}/libnsl-%{glibc_major_version}.so /%{_lib}/libnsl.so.1 -/%{_lib}/libnss_compat-%{glibc_major_version}.so /%{_lib}/libnss_compat.so.2 -/%{_lib}/libnss_db-%{glibc_major_version}.so /%{_lib}/libnss_db.so.2 -/%{_lib}/libnss_dns-%{glibc_major_version}.so /%{_lib}/libnss_dns.so.2 -/%{_lib}/libnss_files-%{glibc_major_version}.so /%{_lib}/libnss_files.so.2 -/%{_lib}/libnss_optfiles-%{glibc_major_version}.so /%{_lib}/libnss_optfiles.so.2 -/%{_lib}/libnss_hesiod-%{glibc_major_version}.so /%{_lib}/libnss_hesiod.so.2 -/%{_lib}/libpthread-%{glibc_major_version}.so /%{_lib}/libpthread.so.0 /%{_lib}/libthread_db-1.0.so /%{_lib}/libthread_db.so.1 -/%{_lib}/libresolv-%{glibc_major_version}.so /%{_lib}/libresolv.so.2 -/%{_lib}/librt-%{glibc_major_version}.so /%{_lib}/librt.so.1 -/%{_lib}/libutil-%{glibc_major_version}.so /%{_lib}/libutil.so.1 %define optimized_libs() \ %dir %attr(0755,root,root) /%{_lib}/%1\ - /%{_lib}/%1/libc-%{glibc_major_version}.so\ /%{_lib}/%1/libc.so.6*\ - /%{_lib}/%1/libm-%{glibc_major_version}.so\ /%{_lib}/%1/libm.so.6*\ - /%{_lib}/%1/libpthread-%{glibc_major_version}.so\ /%{_lib}/%1/libpthread.so.0\ - /%{_lib}/%1/librt-%{glibc_major_version}.so\ /%{_lib}/%1/librt.so.1\ /%{_lib}/%1/libthread_db-1.0.so\ /%{_lib}/%1/libthread_db.so.1 @@ -801,7 +777,6 @@ done %{_libexecdir}/getconf/* %{_sbindir}/glibc_post_upgrade %{_sbindir}/iconvconfig -/%{_lib}/libBrokenLocale-%{glibc_major_version}.so /%{_lib}/libBrokenLocale.so.1 %ifarch %ix86 @@ -812,7 +787,6 @@ done %defattr (755,root,root,755) %dir /%{_lib}/obsolete/ #%dir /%{_lib}/obsolete/noversion - #/%{_lib}/obsolete/noversion/libNoVersion-%{glibc_major_version}.so #/%{_lib}/obsolete/noversion/libNoVersion.so.1 %endif -- 2.7.4