testing/glibc
SHA256
6
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 113387 from home:a_jaeger:my-factory-packages

Browse Source 
Cleanup of patches.

OBS-URL: https://build.opensuse.org/request/show/113387
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=164
This commit is contained in:
Andreas Jaeger
2012-04-13 09:37:44 +00:00
committed by Git OBS Bridge
parent 392fec9468
commit 84ce9e0d13
29 changed files with 2930 additions and 826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
glibc.spec
View File

@@ -16,6 +16,8 @@
#
%bcond_with glibc_run_testsuite
%define crypt_bf_version 1.2
Name: glibc
@@ -27,7 +29,12 @@ BuildRequires: libselinux-devel
BuildRequires: libstdc++-devel
%define _filter_GLIBC_PRIVATE 1
%define build_locales 1
# Enable testsuite runs for local builds
%if %{with glibc_run_testsuite}
%define run_testsuite 1
%else
%define run_testsuite 0
%endif
%define disable_assert 0
%define enable_stackguard_randomization 1
%ifarch ppc ppc64
@@ -164,7 +171,7 @@ Patch46: glibc-resolv-mdnshint.diff
Patch47: glibc-nscd-hconf.diff
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch49: glibc-fini-unwind.diff
# PATCH-FIX-OPENSUSE bnc#657627
# PATCH-FIX-OPENSUSE bnc#657627, http://sourceware.org/bugzilla/show_bug.cgi?id=12561
Patch52: glibc-elf-localscope.diff
# FIX-OPENSUSE compile some files with -fno-strict-aliasing
Patch58: glibc-strict-aliasing.diff
@@ -174,8 +181,10 @@ Patch65: glibc-fix-double-loopback.diff
Patch66: glibc2.14-revert-sunrpc-removal.patch
# PATCH-FIX-OPENSUSE revert seeking on fclose for now bnc#711829 matz@suse.de
Patch67: glibc-revert-fseek-on-fclose.diff
# PATCH-FIX-OPENSUSE Fix crash (access-after-free) in dl_lookup_x bnc#703140 matz@suse.de
# PATCH-FIX-OPENSUSE Fix crash (access-after-free) in dl_lookup_x bnc#703140, bso#13579 matz@suse.de
Patch68: glibc-fix-lookup-crash.patch
# PATCH-FIX-OPENSUSE Fix crash (access-after-free) in dl_lookup_x bnc#703140, bso#13579 matz@suse.de
Patch69: glibc-fix-noload.patch
# PATCH-FIX-OPENSUSE Do not trigger an abort when an i586 Intel CPU is running the i686 library, as valgrind does. bnc#681398 aj@suse.de
Patch71: x86-cpuid-level2.patch
# PATCH-FIX-UPSTREAM Fix assertion error in res_query.c (bso#13013)
@@ -208,6 +217,22 @@ Patch92: glibc-revert-netlink-cache.patch
Patch93: glibc-2.16-avx.patch
# PATCH-FIX-UPSTREAM vfprintf: validate nargs and maybe allocate from heap bnc#747768 - aj@suse.de
Patch94: vfprintf-nargs.patch
# PATCH-FIX-OPENSUSE Fix cycle detection - aj@suse.de
Patch95: cycle-detection.patch
# PATCH-FIX-OPENSUSE Fix LD_PROFILE (glibc bug#13818) - aj@suse.de
Patch96: glibc-ld-profile.patch
# PATCH-FIX-OPENSUSE Fix path for nss_db (bnc#753657) - aj@suse.de
Patch97: nss-db-path.patch
# PATCH-FIX-OPENSUSE Fix crash when nscd is not running (bso#135949) - aj@suse.de
Patch98: glibc-nscd-crash-bso13594.patch
# PATCH-FIX-UPSTREAM Add Arm dependency on libmemusage - bwiedemann@suse.de
Patch99: glibc-add-arm-dependency-libmemusage.patch
# PATCH-FIX-OPENSUSE Fix cycle detection (from Fedora) - aj@suse.de
Patch100: glibc-sw13618-2.patch
# PATCH-FIX-UPSTREAM Fix check abi - aj@suse.de
Patch101: glibc-2.16-fix-check-abi.patch
# PATCH-FIX-UPSTREAM Fix check-localelfplt - aj@suse.de
Patch102: glibc-2.16-fix-check-localplt.patch
%description
The GNU C Library provides the most important standard libraries used
@@ -394,7 +419,7 @@ mv crypt_blowfish-%crypt_bf_version/*.[chS] crypt/
#
%patch0
# libNoVersion part is only active on ix86
%patch1
%patch1 -p1
%patch3
%patch4
%patch5 -p1
@@ -403,8 +428,8 @@ mv crypt_blowfish-%crypt_bf_version/*.[chS] crypt/
%patch8
%patch12
%patch14
%patch16
%patch20
%patch16 -p1
%patch20 -p1
%patch21 -p1
# avoid changing nscd_stat.c mtime to avoid code generation
# differences on each rebuild
@@ -414,36 +439,49 @@ touch -r nscd/nscd_stat.c nscd/s-stamp
touch -r nscd/s-stamp nscd/nscd_stat.c
rm nscd/s-stamp
%patch25
%patch28
%patch28 -p1
%patch29
%patch30
%patch33
%patch36
%patch33 -p1
%patch36 -p1
%patch38
%patch41 -p1
%patch45
%patch46 -p1
%patch47 -p1
%patch49
# XXX: Does not pass testsuite, still there's no better solution yet
%patch52
%patch58
%patch58 -p1
%patch65 -p1
%patch66 -p1
%patch67 -p1
%patch68 -p1
# XXX Patch 69 replaces 68, remove soon
#%patch68 -p1
%patch69 -p1
%patch71 -p1
%patch73 -p1
%patch74 -p1
%patch75 -p1
%patch84
%patch87 -p0
%patch84 -p1
%patch87 -p1
%patch88 -p1 -R
%patch89 -p1
%patch90 -p1
%patch91 -p1
%patch92 -p1 -R
# XXX Should be fixed properly now, remove soon
#%patch92 -p1 -R
%patch93 -p1
%patch94 -p1
%patch95 -p1
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
# %patch96 -p1
%patch97 -p1
%patch98 -p1
%patch99 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
#
# Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
@@ -472,6 +510,9 @@ find . -name configure | xargs touch
#######################################################################
%build
%if %{with glibc_run_testsuite}
echo glibc_run_testsuite is set
%endif
if [ -x /bin/uname.bin ]; then
/bin/uname.bin -a
else
@@ -488,6 +529,10 @@ nice
%else
%define target %{_target_cpu}-suse-linux
%endif
# Don't use as-needed, it breaks glibc assumptions
# Before enabling it, run the testsuite and verify that it
# passes completely
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
@@ -566,6 +611,7 @@ configure_and_build_glibc() {
%else
conf_cflags="$cflags"
%endif
CFLAGS="$conf_cflags" CC="$BuildCC" CXX="$BuildCCplus" ../configure \
--prefix=%{_prefix} \
--libexecdir=%{_libdir} --infodir=%{_infodir} \
@@ -669,6 +715,8 @@ popd
#######################################################################
%check
# The testsuite will fail if asneeded is used
export SUSE_ASNEEDED=0
%if %{run_testsuite}
# Increase timeout
export TIMEOUTFACTOR=16
@@ -682,7 +730,11 @@ popd
make -C cc-base check
%endif
%endif
make -C cc-base check-abi || echo check-abi failed
# File was not created as empty file by patch 101
touch abilist/libnss_dns.abilist abilist/libnss_db.abilist
# XXX This has to pass
#make -C cc-base check-abi || echo check-abi failed
make -C cc-base check-abi
#######################################################################
###
@@ -1065,7 +1117,7 @@ exit 0
%{_libdir}/getconf/*
%{_sbindir}/glibc_post_upgrade
%{_sbindir}/iconvconfig
%dir /var/db
#%dir /var/db
%ifarch %ix86
@@ -1189,6 +1241,6 @@ exit 0
%files extra
%defattr(-,root,root)
%{_bindir}/makedb
/var/db/Makefile
/var/lib/misc/Makefile
%changelog