remove workaround to not strip libthread_db.so to fix provides (check later if debugging works) [release 2.30-2mamba;Sat Oct 26 2019]

This commit is contained in:
Silvan Calarco 2024-01-05 23:07:56 +01:00
parent c37e50d690
commit 6af1975c30

View File

@ -107,8 +107,8 @@
%endif %endif
Name: glibc Name: glibc
Version: 2.29 Version: 2.30
Release: 1mamba Release: 2mamba
Summary: The GNU libc libraries Summary: The GNU libc libraries
Group: System/Libraries Group: System/Libraries
Vendor: openmamba Vendor: openmamba
@ -174,10 +174,8 @@ BuildRequires: libselinux-devel >= 1.22
BuildRequires: libcap-devel BuildRequires: libcap-devel
%endif %endif
BuildRequires: kernelsanitisedheaders BuildRequires: kernelsanitisedheaders
%ifarch %{ix86} Provides: glibc-multilib
Provides: glibc-multilib.x86_64 Obsoletes: glibc-multilib
Obsoletes: glibc-multilib.x86_64
%endif
Requires: ldconfig = %{?epoch:%epoch:}%{version}-%{release} Requires: ldconfig = %{?epoch:%epoch:}%{version}-%{release}
Requires: locales = %{?epoch:%epoch:}%{version}-%{release} Requires: locales = %{?epoch:%epoch:}%{version}-%{release}
Requires: glibc-utils = %{?epoch:%epoch:}%{version}-%{release} Requires: glibc-utils = %{?epoch:%epoch:}%{version}-%{release}
@ -341,7 +339,7 @@ Cross Platform glibc for %{_target_platform}.
%patch5 -p1 %patch5 -p1
%patch17 -p1 %patch17 -p1
%patch18 -p1 #%patch18 -p1
#cd glibc-ports-%{version} #cd glibc-ports-%{version}
#%patch15 -p2 #%patch15 -p2
@ -388,6 +386,9 @@ case %{target_cpu} in
i*86|athlon*) i*86|athlon*)
platform_includes=asm-x86 platform_includes=asm-x86
buildflags="-mtune=pentiumpro -g -O3" buildflags="-mtune=pentiumpro -g -O3"
%if "%{cross_target_cpu}" != ""
buildflags="-mtune=pentiumpro -g -O3 -Wno-error=maybe-uninitialized"
%endif
;; ;;
ppc|powerpc) ppc|powerpc)
platform_includes=asm-powerpc platform_includes=asm-powerpc
@ -620,10 +621,6 @@ install -d %{buildroot}/var/log/nscd
install -D -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/nscd install -D -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/nscd
install -D -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/nscd.conf install -D -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/nscd.conf
install -D -m644 nscd/nscd.service %{buildroot}%{_unitdir}/nscd.service install -D -m644 nscd/nscd.service %{buildroot}%{_unitdir}/nscd.service
# work around to avoid stripping libthread_db-1.0.so for debugging
%if "%{?stage1}" != "1"
chmod -x %{buildroot}/%{slibdir}/libthread_db-1.0.so
%endif
%else %else
rm -rf %{buildroot}%{_sysconfdir} rm -rf %{buildroot}%{_sysconfdir}
rm -rf %{buildroot}%{_infodir} rm -rf %{buildroot}%{_infodir}
@ -631,12 +628,13 @@ rm -rf %{buildroot}%{_mandir}
rm -f %{buildroot}%{_prefix}/%{_target_platform}/%{_sysconfdir}/localtime rm -f %{buildroot}%{_prefix}/%{_target_platform}/%{_sysconfdir}/localtime
rm -f %{buildroot}%{_localstatedir}/db/Makefile rm -f %{buildroot}%{_localstatedir}/db/Makefile
rm -f %{buildroot}%{_prefix}/%{_target_platform}/%{_sysconfdir}/ld.so.cache rm -f %{buildroot}%{_prefix}/%{_target_platform}/%{_sysconfdir}/ld.so.cache
# work around to avoid stripping libthread_db-1.0.so for debugging
%if "%{?stage1}" != "1"
chmod -x %{buildroot}/%{glibc_libdir}/libthread_db-1.0.so
%endif
%endif %endif
## work around to avoid stripping libthread_db-1.0.so for debugging
#%if "%{?stage1}" != "1"
#chmod -x %{buildroot}/%{glibc_libdir}/libthread_db-1.0.so
#%endif
%if "%{multilib}" == "1" %if "%{multilib}" == "1"
cp %{buildroot}%{glibc_includedir}/gnu/stubs-32.h %{buildroot}/ cp %{buildroot}%{glibc_includedir}/gnu/stubs-32.h %{buildroot}/
rm -rf %{buildroot}%{glibc_includedir} rm -rf %{buildroot}%{glibc_includedir}
@ -924,6 +922,12 @@ fi
%endif %endif
%changelog %changelog
* Sat Oct 26 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.30-2mamba
- remove workaround to not strip libthread_db.so to fix provides (check later if debugging works)
* Fri Aug 16 2019 Automatic Build System <autodist@mambasoft.it> 2.30-1mamba
- automatic version update by autodist
* Thu Feb 28 2019 Automatic Build System <autodist@mambasoft.it> 2.29-1mamba * Thu Feb 28 2019 Automatic Build System <autodist@mambasoft.it> 2.29-1mamba
- automatic version update by autodist - automatic version update by autodist
@ -1190,14 +1194,14 @@ fi
* Mon May 05 2003 Silvan Calarco <silvan.calarco@qinet.it> 2.3.2-5qilnx * Mon May 05 2003 Silvan Calarco <silvan.calarco@qinet.it> 2.3.2-5qilnx
- removed /etc/localtime link (will be in setup package) - removed /etc/localtime link (will be in setup package)
* Tue Apr 24 2003 Silvan Calarco <silvan.calarco@qinet.it> 2.3.2-4qilnx * Thu Apr 24 2003 Silvan Calarco <silvan.calarco@qinet.it> 2.3.2-4qilnx
- added linux kernel includes: /usr/include/linux, /usr/include/asm - added linux kernel includes: /usr/include/linux, /usr/include/asm
- addded _libdir files in devel package - addded _libdir files in devel package
* Tue Apr 16 2003 Silvan Calarco <silvan.calarco@qinet.it> 2.3.2-3qilnx * Wed Apr 16 2003 Silvan Calarco <silvan.calarco@qinet.it> 2.3.2-3qilnx
- removed _libdir and _bindir * references not to include util package files - removed _libdir and _bindir * references not to include util package files
* Tue Apr 16 2003 Silvan Calarco <silvan.calarco@qinet.it> 2.3.2-2qilnx * Wed Apr 16 2003 Silvan Calarco <silvan.calarco@qinet.it> 2.3.2-2qilnx
- fixed find_requires and find_provides scripts: ignore GLIBC_PRIVATE references - fixed find_requires and find_provides scripts: ignore GLIBC_PRIVATE references
- added util package, so glibc doesn't need perl as a dependancy - added util package, so glibc doesn't need perl as a dependancy