forked from pool/glibc
Accepting request 142317 from Base:System
Really remove glibc-compiled-binaries.diff (forwarded request 142316 from a_jaeger) OBS-URL: https://build.opensuse.org/request/show/142317 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=125
This commit is contained in:
Stephan Kulow
committed by
Git OBS Bridge
Git OBS Bridge
parent
c1aeaefb24
commit
fb4de980bc
43
glibc.spec
43
glibc.spec
@@ -119,17 +119,13 @@ Obsoletes: glibc-32bit
|
||||
Provides: ld-linux.so.3
|
||||
Provides: ld-linux.so.3(GLIBC_2.4)
|
||||
%endif
|
||||
Version: 2.16
|
||||
Version: 2.16.90
|
||||
Release: 0
|
||||
%define glibc_major_version 2.16
|
||||
%define git_id c3b96f90c9c1
|
||||
%define glibc_ports_ver 2.16
|
||||
%define ports_git_id a20c2b3c87ae
|
||||
%define glibc_major_version 2.16.90
|
||||
%define git_id f59cba71d848
|
||||
Url: http://www.gnu.org/software/libc/libc.html
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source: glibc-%{version}-%{git_id}.tar.xz
|
||||
%define glibc_ports_dir glibc-ports-%{glibc_ports_ver}
|
||||
Source2: glibc-ports-%{glibc_ports_ver}-%{ports_git_id}.tar.xz
|
||||
Source3: noversion.tar.bz2
|
||||
Source4: manpages.tar.bz2
|
||||
Source5: nsswitch.conf
|
||||
@@ -201,8 +197,6 @@ Patch13: glibc-2.3.2.no_archive.diff
|
||||
Patch14: glibc-2.3.90-bindresvport.blacklist.diff
|
||||
# PATCH-FIX-OPENSUSE prefer -lang rpm packages
|
||||
Patch15: glibc-2.3.90-langpackdir.diff
|
||||
# PATCH-FIX-OPENSUSE add option --enable-runbinaries to disable running of compiled binaries
|
||||
Patch17: glibc-compiled-binaries.diff
|
||||
# PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review)
|
||||
Patch18: glibc-cpusetsize.diff
|
||||
# PATCH-FIX-OPENSUSE Allow ARM binaries with old linker path to run - aj@suse.de
|
||||
@@ -223,8 +217,6 @@ Patch103: glibc-2.4-china.diff
|
||||
### Broken patches in glibc that we revert for now:
|
||||
# PATCH-FIX-OPENSUSE revert seeking on fclose for now bnc#711829 matz@suse.de
|
||||
Patch201: glibc-revert-fseek-on-fclose.diff
|
||||
# PATCH-FIX-OPENSUSE revert pthread-cond-wait change since it causes hangs - aj@suse.de
|
||||
Patch202: pthread-cond-wait-revert.patch
|
||||
|
||||
### Network related patches
|
||||
# PATCH-FIX-OPENSUSE reload /etc/resolv.conf on change
|
||||
@@ -233,8 +225,6 @@ Patch300: glibc-resolv-reload.diff
|
||||
Patch301: glibc-2.2-sunrpc.diff
|
||||
# PATCH-FIX-OPENSUSE only use ipv6 if real ipv6 address exists bnc#361697, bnc#684534
|
||||
Patch302: getaddrinfo-ipv6-sanity.diff
|
||||
# PATCH-FIX-OPENSUSE Consider private IPv4 addresses as global-scope in gai.conf [bnc#597616]
|
||||
Patch303: glibc-gai-private4.diff
|
||||
# PATCH-FIX-OPENSUSE Warn about usage of mdns in resolv.conv
|
||||
Patch304: glibc-resolv-mdnshint.diff
|
||||
# PATCH-FIX-OPENSUSE nscd does not account for 'multi on' in /etc/host.conf when ai-resolving host bso#11928
|
||||
@@ -251,13 +241,6 @@ Patch402: nscd-avoid-gcc-warning.diff
|
||||
###
|
||||
# Patches from upstream
|
||||
###
|
||||
# PATCH-FIX-UPSTREAM Fix malloc_usable_size swo#1349, bnc#745247 - aj@suse.de
|
||||
Patch1001: malloc-check-size.patch
|
||||
|
||||
# PATCH-FIX-UPSTREAM Fix dns buffer - aj@suse.de
|
||||
Patch1021: glibc-2.16-getaddrinfo-buffer.patch
|
||||
# PATCH-FIX-UPSTREAM Fix sparc dynamic linker triggered by bind-now swo#14376 - aj@suse.de
|
||||
Patch1022: sparc-bind-now.patch
|
||||
|
||||
###
|
||||
# Patches awaiting upstream approval
|
||||
@@ -443,7 +426,7 @@ versions of your software.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -n glibc-%{version} -q -a 2 -a 3 -a 4
|
||||
%setup -n glibc-%{version} -q -a 3 -a 4
|
||||
# Owl crypt_blowfish
|
||||
tar -xzf %SOURCE50
|
||||
pushd crypt_blowfish-%{crypt_bf_version}
|
||||
@@ -471,7 +454,6 @@ rm nscd/s-stamp
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch21 -p1
|
||||
|
||||
@@ -481,12 +463,10 @@ rm nscd/s-stamp
|
||||
%patch103 -p1
|
||||
|
||||
%patch201 -p1
|
||||
%patch202 -p1
|
||||
|
||||
%patch300 -p1
|
||||
%patch301 -p1
|
||||
%patch302 -p1
|
||||
%patch303 -p1
|
||||
#%patch302 -p1
|
||||
%patch304 -p1
|
||||
%patch305 -p1
|
||||
%patch306 -p1
|
||||
@@ -497,9 +477,6 @@ rm nscd/s-stamp
|
||||
%ifarch armv7l armv7hl
|
||||
%patch20 -p1
|
||||
%endif
|
||||
%patch1001 -p1
|
||||
%patch1021 -p1
|
||||
%patch1022 -p1
|
||||
|
||||
%patch2001 -p1
|
||||
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
|
||||
@@ -557,7 +534,7 @@ nice
|
||||
export SUSE_ASNEEDED=0
|
||||
# Adjust glibc version.h
|
||||
echo "#define CONFHOST \"%{target}\"" >> version.h
|
||||
echo "#define CVSDATE \"`date -r ChangeLog +%Y%m%d`\"" >> version.h
|
||||
echo "#define GITID \"%{git_id}\"" >> version.h
|
||||
#
|
||||
# Default CFLAGS and Compiler
|
||||
#
|
||||
@@ -613,7 +590,7 @@ add_ons=",libidn"
|
||||
add_ons=$add_ons,noversion
|
||||
%endif
|
||||
%ifarch %arm mipsel ia64
|
||||
add_ons=$add_ons,%glibc_ports_dir
|
||||
add_ons=$add_ons,ports
|
||||
%endif
|
||||
%ifarch %arm mipsel
|
||||
# fails to build otherwise - need to recheck and fix
|
||||
@@ -652,7 +629,7 @@ configure_and_build_glibc() {
|
||||
--enable-stackguard-randomization \
|
||||
%endif
|
||||
--build=%{target} --host=%{target} \
|
||||
%ifarch ppc ppc64 %{ix86} x86_64
|
||||
%ifarch %{ix86} x86_64 sparc sparc64 s390 s390x
|
||||
--enable-multi-arch \
|
||||
%endif
|
||||
%ifarch mipsel
|
||||
@@ -700,11 +677,11 @@ configure_and_build_glibc() {
|
||||
%endif
|
||||
; do
|
||||
configure_and_build_glibc $pcpu "$BuildFlags -mcpu=$pcpu" "$add_ons" \
|
||||
--with-cpu=$pcpu --disable-runbinaries
|
||||
--with-cpu=$pcpu
|
||||
done
|
||||
# Eventually, special Cell variant:
|
||||
%if %{powerpc_optimize_cpu_cell}
|
||||
configure_and_build_glibc ppc-cell-be "$BuildFlags -mcpu=cell" "$add_ons" --disable-runbinaries
|
||||
configure_and_build_glibc ppc-cell-be "$BuildFlags -mcpu=cell" "$add_ons"
|
||||
%endif
|
||||
%endif # optimize_power
|
||||
|
||||
|
||||
Reference in New Issue
Block a user