From fc3890705e4fe86a207177c26ed5e0293882c3be459666792d0b6cbeb715cbac Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 5 Jul 2011 08:02:08 +0000 Subject: [PATCH] Accepting request 75379 from home:a_jaeger:branches:openSUSE:Factory Cleanup OBS-URL: https://build.opensuse.org/request/show/75379 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=74 --- glibc-statfs64-ia64.diff | 12 ------------ glibc.changes | 2 ++ glibc.spec | 6 ------ 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 glibc-statfs64-ia64.diff diff --git a/glibc-statfs64-ia64.diff b/glibc-statfs64-ia64.diff deleted file mode 100644 index 1804a68..0000000 --- a/glibc-statfs64-ia64.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- sysdeps/unix/sysv/linux/statfs64.c~ 2010-01-27 02:47:32.884315000 +0100 -+++ sysdeps/unix/sysv/linux/statfs64.c 2010-01-27 02:49:17.943657000 +0100 -@@ -24,6 +24,9 @@ - #include - #include - -+/* On IA64, ia32el does not provide wrapper for statfs64() for some reason. -+ Force the compatibility code to get compiled in. [bnc#534828] */ -+#undef __ASSUME_STATFS64 - - # if __ASSUME_STATFS64 == 0 - int __no_statfs64 attribute_hidden; diff --git a/glibc.changes b/glibc.changes index 3798767..d62159f 100644 --- a/glibc.changes +++ b/glibc.changes @@ -5,6 +5,8 @@ Mon Jul 4 10:00:46 UTC 2011 - aj@suse.de and allow override of system directories (bnc#671725) - Fix futex bug (added patch glibc-fix-rwlock-stack-imbalance.patch from sourceware bug #12403). +- Remove glibc-statfs64-ia64.diff since current ia32el has the bug + fixed. ------------------------------------------------------------------- Fri Jul 1 16:09:14 UTC 2011 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index 24f966c..823f737 100644 --- a/glibc.spec +++ b/glibc.spec @@ -161,8 +161,6 @@ Patch38: glibc-cpusetsize.diff Patch40: libm-x86-64-exceptions.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch41: glibc-uio-cell.diff -# PATCH-FIX-SLE -- Do not assume statfs64 exists for ia64's ia32 layer bnc#534828 -Patch42: glibc-statfs64-ia64.diff # PATCH-FIX-UPSTREAM -- add missing includes aj@suse.de Patch43: missing-include-build-fix.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -421,10 +419,6 @@ rm nscd/s-stamp %patch38 %patch40 %patch41 -p1 -%if 0%{?sles_version} -# Only apply for x86 on SLES -%patch42 -%endif %patch43 -p1 %patch44 -p1 %patch45