From b6079b40dc8983955e1611ab7604351b913d5c69 Mon Sep 17 00:00:00 2001 From: Slava Barinov Date: Tue, 28 Feb 2023 15:46:50 +0300 Subject: [PATCH] Add symlinks into %install and packaging Change-Id: I32e81e183ed4e84c76de8c8b86aafe00c20ea126 Signed-off-by: Slava Barinov --- packaging/glibc.spec | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/packaging/glibc.spec b/packaging/glibc.spec index ac1c86b..c9938f5 100644 --- a/packaging/glibc.spec +++ b/packaging/glibc.spec @@ -598,6 +598,14 @@ export RPM_BUILD_ROOT mkdir -p %{buildroot}/%{_lib}/obsolete %endif +# Prepare symlinks to versioned libraries +ln -sf libpthread.so.0 %{buildroot}%{_libdir}/libpthread.so +ln -sf libutil.so.1 %{buildroot}%{_libdir}/libutil.so +ln -sf librt.so.1 %{buildroot}%{_libdir}/librt.so +ln -sf libdl.so.2 %{buildroot}%{_libdir}/libdl.so +ln -sf libm.so.6 %{buildroot}%{_libdir}/libm.so +ln -sf libresolv.so.2 %{buildroot}%{_libdir}/libresolv.so + # Miscelanna: install -m 0700 build/glibc_post_upgrade %{buildroot}%{_sbindir} @@ -712,8 +720,6 @@ done %post devel # TODO: REMOVE ME AFTER ISSUE IS IDENTIFIED find %{_libdir}/gcc -name 'statx.h' -exec sed -e 's/__glibc_has_include/__has_include/' -i {} \; -ln -sf %{_libdir}/libpthread.so.0 %{_libdir}/libpthread.so -ln -sf /usr/lib/libpthread.so.0 /usr/lib/libpthread.so %post devel-static # TODO: REMOVE ME AFTER ISSUE IS IDENTIFIED @@ -752,10 +758,10 @@ find %{_libdir}/gcc -name 'statx.h' -exec sed -e 's/__glibc_has_include/__has_in %endif /%{_lib}/libanl.so.1 -/%{_lib}/libc.so.6* -/%{_lib}/libcrypt.so.1 -/%{_lib}/libdl.so.2* -/%{_lib}/libm.so.6* +/%{_lib}/libc.so* +/%{_lib}/libcrypt.so* +/%{_lib}/libdl.so* +/%{_lib}/libm.so* /%{_lib}/libnsl.so.1 /%{_lib}/libnss_compat.so.2 /%{_lib}/libnss_db.so.2 @@ -766,8 +772,8 @@ find %{_libdir}/gcc -name 'statx.h' -exec sed -e 's/__glibc_has_include/__has_in /%{_lib}/libpthread.so* /%{_lib}/libthread_db.so.1 /%{_lib}/libresolv.so.2 -/%{_lib}/librt.so.1 -/%{_lib}/libutil.so.1 +/%{_lib}/librt.so* +/%{_lib}/libutil.so* /%{_lib}/libc_malloc_debug.so.0 %define optimized_libs() \ %dir %attr(0755,root,root) /%{_lib}/%1\ -- 2.7.4