From 4a5520db4f725432a47ccd59cb3d678a2f931ba4 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 23:07:57 +0100 Subject: [PATCH] automatic version update by autodist [release 2.32-1mamba;Thu Aug 06 2020] --- glibc.spec | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/glibc.spec b/glibc.spec index 8fe474c..d8ff2ba 100644 --- a/glibc.spec +++ b/glibc.spec @@ -83,7 +83,7 @@ %endif Name: glibc -Version: 2.31 +Version: 2.32 Release: 1mamba Summary: The GNU libc libraries Group: System/Libraries @@ -142,7 +142,11 @@ Requires(post):%{__install_info} BuildRequires: libselinux-devel >= 1.22 BuildRequires: libcap-devel %endif +%if "%{?stage1}" != "1" BuildRequires: kernelsanitisedheaders +BuildRequires: libpython3-devel +BuildRequires: elfutils +%endif Requires: ldconfig = %{?epoch:%epoch:}%{version}-%{release} Requires: locales = %{?epoch:%epoch:}%{version}-%{release} Requires: glibc-utils = %{?epoch:%epoch:}%{version}-%{release} @@ -372,6 +376,11 @@ case %{target_cpu} in buildflags="-g -O2" CONFIG_OPTS="--enable-targets=x86_64-%{_target_vendor}-linux --enable-multi-arch --enable-static-pie --enable-cet" ;; + aarch64) + platform_includes=asm-aarch64 + buildflags="-g -O2" + CONFIG_OPTS="--enable-targets=aarch64-%{_target_vendor}-linux --enable-multi-arch --enable-static-pie --enable-cet" + ;; *) echo "Target CPU %{target_cpu} not supported. Aborting." exit 1 @@ -420,7 +429,7 @@ _configure_flags=( --prefix=%{glibc_prefix} \ --infodir=%{_infodir} \ --libexecdir=%{glibc_libexecdir} \ - --with-headers=${headers_dir} \ +# --with-headers=${headers_dir} \ --with-bugurl=https://bugs.openmamba.org/ \ ${opt_tls} ${opt_selinux} \ --enable-lock-elision \ @@ -466,6 +475,7 @@ echo "CC += -D_FORTIFY_SOURCE=2" >> configparms echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms make %{_smp_mflags} -r %PARALLELMFLAGS=-s slibdir=%{slibdir} +:<< __EOF # build documentation (pdf and html formats) %if %{build_doc} make pdf html @@ -508,8 +518,6 @@ make %{_smp_mflags} -r %PARALLELMFLAGS=-s %endif %endif -#___EOF - %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -724,12 +732,15 @@ fi %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/rpc %attr(0755,-,-) /%{slibdir}/* +%ifarch aarch64 +/lib/ld-linux-aarch64.so.1 +%endif %exclude %{slibdir}/libmemusage.so %exclude %{slibdir}/libpcprofile.so %dir %{glibc_libdir}/gconv %{glibc_libdir}/gconv/* %dir %{glibc_libexecdir}/getconf -%ifnarch x86_64 +%ifnarch x86_64 aarch64 %{glibc_libexecdir}/getconf/POSIX_V6_ILP32_OFF32 %{glibc_libexecdir}/getconf/POSIX_V6_ILP32_OFFBIG %{glibc_libexecdir}/getconf/POSIX_V7_ILP32_OFF32 @@ -737,7 +748,7 @@ fi %{glibc_libexecdir}/getconf/XBS5_ILP32_OFF32 %{glibc_libexecdir}/getconf/XBS5_ILP32_OFFBIG %endif -%ifarch x86_64 +%ifarch x86_64 aarch64 %{glibc_libexecdir}/getconf/POSIX_V6_LP64_OFF64 %{glibc_libexecdir}/getconf/POSIX_V7_LP64_OFF64 %{glibc_libexecdir}/getconf/XBS5_LP64_OFF64 @@ -836,12 +847,8 @@ fi %files -n locales -f libc.lang %defattr(-,root,root) %{glibc_datadir}/locale/locale.alias -%ifnarch x86_64 -%dir %{glibc_libdir}/locale -%{glibc_libdir}/locale/locale-archive -%else +%dir %{_prefix}/lib/locale %{_prefix}/lib/locale/locale-archive -%endif %files -n nscd %defattr(-,root,root) @@ -873,6 +880,9 @@ fi %endif %changelog +* Thu Aug 06 2020 Automatic Build System 2.32-1mamba +- automatic version update by autodist + * Tue Mar 03 2020 Automatic Build System 2.31-1mamba - automatic version update by autodist