rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use upstream default for multi-arch support

Browse Source 
Drop binutils run-time conflict.  If we still want those, they should
be on glibc-devel, not the main package.
This commit is contained in:
Florian Weimer 2017-08-16 11:12:36 +02:00
parent 669790c2cf
commit 2d4666e460
1 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
glibc.spec
View File

@ -131,14 +131,6 @@
# will be created for the architecture. # will be created for the architecture.
%define debuginfocommonarches %{biarcharches} alpha alphaev6 %define debuginfocommonarches %{biarcharches} alpha alphaev6
############################################################################## ##############################################################################
# If the architecture has multiarch support in glibc then it should be listed
# here to enable support in the build. Multiarch support is a single library
# with implementations of certain functions for multiple architectures. The
# most optimal function is selected at runtime based on the hardware that is
# detected by glibc. The underlying support for function selection and
# execution is provided by STT_GNU_IFUNC.
%define multiarcharches %{power64} %{ix86} x86_64 %{sparc}
##############################################################################
# Add -s for a less verbose build output. # Add -s for a less verbose build output.
%define silentrules PARALLELMFLAGS= %define silentrules PARALLELMFLAGS=
############################################################################## ##############################################################################
@ -380,29 +372,9 @@ Conflicts: kernel < %{enablekernel}
%endif %endif
%endif %endif
%ifarch %{multiarcharches} BuildRequires: binutils >= 2.25
# Need STT_IFUNC support
%ifarch %{power64}
BuildRequires: binutils >= 2.20.51.0.2
Conflicts: binutils < 2.20.51.0.2
%else
%ifarch s390 s390x
# Needed for STT_GNU_IFUNC support for s390/390x
BuildRequires: binutils >= 2.23.52.0.1-8
Conflicts: binutils < 2.23.52.0.1-8
%else
# Default to this version
BuildRequires: binutils >= 2.19.51.0.10
Conflicts: binutils < 2.19.51.0.10
%endif
%endif
# Earlier releases have broken support for IRELATIVE relocations # Earlier releases have broken support for IRELATIVE relocations
Conflicts: prelink < 0.4.2 Conflicts: prelink < 0.4.2
%else
# Need AS_NEEDED directive
# Need --hash-style=* support
BuildRequires: binutils >= 2.17.50.0.2-5
%endif
BuildRequires: gcc >= 3.2.1-5 BuildRequires: gcc >= 3.2.1-5
%ifarch s390 s390x %ifarch s390 s390x
@ -1012,7 +984,7 @@ AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(nptl\|powerpc-cpu\)\( \|$
# Build glibc in `build-%{target}$1', passing the rest of the arguments # Build glibc in `build-%{target}$1', passing the rest of the arguments
# as CFLAGS to the build (not the same as configure CFLAGS). Several # as CFLAGS to the build (not the same as configure CFLAGS). Several
# global values are used to determine build flags, add-ons, kernel # global values are used to determine build flags, add-ons, kernel
# version, multiarch support, system tap support, etc. # version, system tap support, etc.
############################################################################## ##############################################################################
build() build()
{ {
@ -1030,9 +1002,6 @@ build()
--enable-add-ons=$AddOns \ --enable-add-ons=$AddOns \
--with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \ --with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \
--build=%{target} \ --build=%{target} \
%ifarch %{multiarcharches}
--enable-multi-arch \
%endif
--enable-stack-protector=strong \ --enable-stack-protector=strong \
--enable-tunables \ --enable-tunables \
--enable-obsolete-rpc \ --enable-obsolete-rpc \