rpms/glibc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove /etc/ld.so.conf/glibc[64].conf files adding /lib[64] before usr-merge to fix e.g. apps based on QtWebEngine [release 2.35-2mamba;Thu Jun 16 2022]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 23:07:58 +01:00
parent d83a0f2c24
commit 71b1de1d44
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
glibc.spec
View File

@ -84,7 +84,7 @@
Name: glibc Name: glibc
Version: 2.35 Version: 2.35
Release: 1mamba Release: 2mamba
Summary: The GNU libc libraries Summary: The GNU libc libraries
Group: System/Libraries Group: System/Libraries
Vendor: openmamba Vendor: openmamba
@ -532,6 +532,7 @@ ln -s ../lib/locale %{buildroot}/usr/lib32/locale
# WORKAROUND: worked up to 2.21 # WORKAROUND: worked up to 2.21
mkdir -p %{buildroot}%{_prefix}/lib/locale mkdir -p %{buildroot}%{_prefix}/lib/locale
make LOCALEDEF="I18NPATH=. LC_ALL=C localedef" localedata/install-locales -C ../glibc-build install_root=%{buildroot} make LOCALEDEF="I18NPATH=. LC_ALL=C localedef" localedata/install-locales -C ../glibc-build install_root=%{buildroot}
install -d -m0755 %{buildroot}%{glibc_prefix}/lib/locale/
mv %{buildroot}%{_prefix}/lib/locale/* %{buildroot}%{glibc_prefix}/lib/locale/ mv %{buildroot}%{_prefix}/lib/locale/* %{buildroot}%{glibc_prefix}/lib/locale/
%endif %endif
mv localedata/SUPPORTED localedata/SUPPORTED.openmamba mv localedata/SUPPORTED localedata/SUPPORTED.openmamba
@ -618,17 +619,17 @@ cp -a ../glibc-build/manual/libc/* %{buildroot}%{_docdir}/libc/html/
cp -a ../glibc-build/manual/libc.pdf %{buildroot}%{_docdir}/libc/ cp -a ../glibc-build/manual/libc.pdf %{buildroot}%{_docdir}/libc/
%endif %endif
# provide legacy /lib[64] after glibc migration to /usr/lib[64] ## provide legacy /lib[64] after glibc migration to /usr/lib[64]
install -d -m0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d #install -d -m0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d
%ifarch x86_64 aarch64 #%ifarch x86_64 aarch64
cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/glibc64.conf << __EOF #cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/glibc64.conf << __EOF
/%{_lib} #/%{_lib}
__EOF #__EOF
%else #%else
cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/glibc.conf << __EOF #cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/glibc.conf << __EOF
/%{_lib} #/%{_lib}
__EOF #__EOF
%endif #%endif
%endif %endif
%endif %endif
@ -842,7 +843,7 @@ fi
%if "%{_target_platform}" == "%{_host}" %if "%{_target_platform}" == "%{_host}"
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_sysconfdir}/ld.so.conf.d/glibc*.conf #%{_sysconfdir}/ld.so.conf.d/glibc*.conf
%config(noreplace) %{_sysconfdir}/rpc %config(noreplace) %{_sysconfdir}/rpc
%attr(0755,-,-) /%{slibdir}/lib*.so.* %attr(0755,-,-) /%{slibdir}/lib*.so.*
%ifarch aarch64 %ifarch aarch64
@ -990,6 +991,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Jun 16 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 2.35-2mamba
- remove /etc/ld.so.conf/glibc[64].conf files adding /lib[64] before usr-merge to fix e.g. apps based on QtWebEngine
* Sat Feb 05 2022 Automatic Build System <autodist@mambasoft.it> 2.35-1mamba * Sat Feb 05 2022 Automatic Build System <autodist@mambasoft.it> 2.35-1mamba
- automatic version update by autodist - automatic version update by autodist