Djam/glibc40
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/glibc40.git synced 2025-02-23 15:52:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "BR 32-bit libs on 64-bit systems to link 32-bit executables with them"

Browse source 
This reverts commit 1b2bba6f87.
This commit is contained in:
Mikhail Novosyolov 2019-09-29 18:34:48 +03:00
parent f1afd2b042
commit 5be42839fc
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
glibc.spec
View file

@ -90,12 +90,6 @@
# Distro-specific default value is defined in branding-configs package
%{?build_selinux}%{?!build_selinux:%bcond_with selinux}
%if %{with selinux}
%define libselinux_maj %(if [ -f %{_libdir}/libselinux.so ] && command -v readelf 2>/dev/null >/dev/null; then readelf -a %{_libdir}/libselinux.so | grep '(SONAME)' | tr -d '[]' | awk -F '.' '{print $NF}'; else echo 1; fi)
%define libaudit_maj %(if [ -f %{_libdir}/libaudit.so ] && command -v readelf 2>/dev/null >/dev/null; then readelf -a %{_libdir}/libaudit.so | grep '(SONAME)' | tr -d '[]' | awk -F '.' '{print $NF}'; else echo 1; fi)
%define libcap_maj %(if [ -f %{_libdir}/libcap.so ] && command -v readelf 2>/dev/null >/dev/null; then readelf -a %{_libdir}/libcap.so | grep '(SONAME)' | tr -d '[]' | awk -F '.' '{print $NF}'; else echo 2; fi)
%endif
# Define to build a biarch package
%define build_biarch 0
%if %isarch %{x86_64} mips64 mips64el mips mipsel
@ -133,7 +127,7 @@ Source0: http://ftp.gnu.org/gnu/glibc/%{oname}-%{ver}.tar.xz
#Source1: http://ftp.gnu.org/gnu/glibc/%{oname}-%{ver}.tar.xz.sig
#endif
%endif
Release: 14
Release: 12
License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
Group: System/Libraries
Url: http://www.gnu.org/software/libc/
@ -267,19 +261,10 @@ BuildRequires: bison
BuildRequires: pkgconfig(libidn2)
BuildRequires: systemd
%if %{with selinux}
# readelf is in binutils
BuildRequires(pre): binutils
# see configure.ac
BuildRequires: selinux-devel
BuildRequires: audit-devel
BuildRequires: pkgconfig(libcap)
%if "%{?_lib}" == "lib64"
# 32 bit binary libraries are also required on 64 bit systems
# for linking 32 bit executables
BuildRequires: libselinux%{libselinux_maj}
BuildRequires: libaudit%{libaudit_maj}
BuildRequires: libcap%{libcap_maj}
%endif
%endif
BuildRequires: texinfo
%if %{with pdf}