forked from pool/glibc
Accepting request 74183 from home:a_jaeger:branches:openSUSE:Factory
Remove prereq on permissions as discussed with Coolo as hot-fix for M2 OBS-URL: https://build.opensuse.org/request/show/74183 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=66
This commit is contained in:
Andreas Jaeger
Git OBS Bridge
parent
e66122a78d
commit
a72524f516
113
glibc-x86-bits-sigcontext.patch
Normal file
113
glibc-x86-bits-sigcontext.patch
Normal file
@ -0,0 +1,113 @@
|
||||
2011-06-20 Andreas Jaeger <aj@suse.de>
|
||||
|
||||
* sysdeps/unix/sysv/linux/i386/bits/sigcontext.h: New file.
|
||||
|
||||
============================================================
|
||||
Index: ./sysdeps/unix/sysv/linux/i386/bits/sigcontext.h
|
||||
--- ./sysdeps/unix/sysv/linux/i386/bits/sigcontext.h created
|
||||
+++ ./sysdeps/unix/sysv/linux/i386/bits/sigcontext.h 2011-06-20 12:14:48.528411362 +0200 1.1
|
||||
@@ -0,0 +1,104 @@
|
||||
+/* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||
+ This file is part of the GNU C Library.
|
||||
+
|
||||
+ The GNU C Library is free software; you can redistribute it and/or
|
||||
+ modify it under the terms of the GNU Lesser General Public
|
||||
+ License as published by the Free Software Foundation; either
|
||||
+ version 2.1 of the License, or (at your option) any later version.
|
||||
+
|
||||
+ The GNU C Library is distributed in the hope that it will be useful,
|
||||
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ Lesser General Public License for more details.
|
||||
+
|
||||
+ You should have received a copy of the GNU Lesser General Public
|
||||
+ License along with the GNU C Library; if not, write to the Free
|
||||
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
+ 02111-1307 USA. */
|
||||
+
|
||||
+#ifndef _BITS_SIGCONTEXT_H
|
||||
+#define _BITS_SIGCONTEXT_H 1
|
||||
+
|
||||
+#if !defined _SIGNAL_H && !defined _SYS_UCONTEXT_H
|
||||
+# error "Never use <bits/sigcontext.h> directly; include <signal.h> instead."
|
||||
+#endif
|
||||
+
|
||||
+struct _fpreg
|
||||
+{
|
||||
+ unsigned short significand[4];
|
||||
+ unsigned short exponent;
|
||||
+};
|
||||
+
|
||||
+struct _fpxreg
|
||||
+{
|
||||
+ unsigned short significand[4];
|
||||
+ unsigned short exponent;
|
||||
+ unsigned short padding[3];
|
||||
+};
|
||||
+
|
||||
+struct _xmmreg
|
||||
+{
|
||||
+ __uint32_t element[4];
|
||||
+};
|
||||
+
|
||||
+
|
||||
+
|
||||
+struct _fpstate
|
||||
+{
|
||||
+ /* Regular FPU environment. */
|
||||
+ __uint32_t cw;
|
||||
+ __uint32_t sw;
|
||||
+ __uint32_t tag;
|
||||
+ __uint32_t ipoff;
|
||||
+ __uint32_t cssel;
|
||||
+ __uint32_t dataoff;
|
||||
+ __uint32_t datasel;
|
||||
+ struct _fpreg _st[8];
|
||||
+ unsigned short status;
|
||||
+ unsigned short magic;
|
||||
+
|
||||
+ /* FXSR FPU environment. */
|
||||
+ __uint32_t _fxsr_env[6];
|
||||
+ __uint32_t mxcsr;
|
||||
+ __uint32_t reserved;
|
||||
+ struct _fpxreg _fxsr_st[8];
|
||||
+ struct _xmmreg _xmm[8];
|
||||
+ __uint32_t padding[56];
|
||||
+};
|
||||
+
|
||||
+#ifndef sigcontext_struct
|
||||
+/* Kernel headers before 2.1.1 define a struct sigcontext_struct, but
|
||||
+ we need sigcontext. Some packages have come to rely on
|
||||
+ sigcontext_struct being defined on 32-bit x86, so define this for
|
||||
+ their benefit. */
|
||||
+# define sigcontext_struct sigcontext
|
||||
+#endif
|
||||
+
|
||||
+struct sigcontext
|
||||
+{
|
||||
+ unsigned short gs, __gsh;
|
||||
+ unsigned short fs, __fsh;
|
||||
+ unsigned short es, __esh;
|
||||
+ unsigned short ds, __dsh;
|
||||
+ unsigned long edi;
|
||||
+ unsigned long esi;
|
||||
+ unsigned long ebp;
|
||||
+ unsigned long esp;
|
||||
+ unsigned long ebx;
|
||||
+ unsigned long edx;
|
||||
+ unsigned long ecx;
|
||||
+ unsigned long eax;
|
||||
+ unsigned long trapno;
|
||||
+ unsigned long err;
|
||||
+ unsigned long eip;
|
||||
+ unsigned short cs, __csh;
|
||||
+ unsigned long eflags;
|
||||
+ unsigned long esp_at_signal;
|
||||
+ unsigned short ss, __ssh;
|
||||
+ struct _fpstate * fpstate;
|
||||
+ unsigned long oldmask;
|
||||
+ unsigned long cr2;
|
||||
+};
|
||||
+
|
||||
+
|
||||
+#endif /* _BITS_SIGCONTEXT_H */
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 20 11:02:01 UTC 2011 - aj@suse.de
|
||||
|
||||
- Remove PreReq on permissions to avoid a cycle that gives leads to
|
||||
an uninstallable system (bnc#700925).
|
||||
- Fix <bits/sigcontext.h> on x86 - fixes scpm compilation.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 17 09:50:19 UTC 2011 - aj@suse.de
|
||||
|
||||
|
||||
@ -85,7 +85,6 @@ Source12: glibc_post_upgrade.c
|
||||
Source15: glibc.rpmlintrc
|
||||
Source16: baselibs.conf
|
||||
PreReq: filesystem
|
||||
PreReq: permissions
|
||||
Provides: rtld(GNU_HASH)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if %_target_cpu == "i686"
|
||||
@ -198,6 +197,8 @@ Patch56: glibc-static-memcpy.diff
|
||||
Patch58: glibc-strict-aliasing.diff
|
||||
# PATCH-FIX-UPSTREAM fix preloading of shared libs aj@suse.de
|
||||
Patch59: glibc-2.13-dl-load.patch
|
||||
# PATCH-FIX-UPSTREAM fix x86 <bits/sigcontext.h aj@suse.de
|
||||
Patch60: glibc-x86-bits-sigcontext.patch
|
||||
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch500: ARM_glibc-2.10.1-local-eabi-wchar.diff
|
||||
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
@ -321,7 +322,6 @@ library.
|
||||
|
||||
%package devel-static
|
||||
|
||||
|
||||
Summary: C library static libraries for -static linking
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name}-devel = %{version}
|
||||
@ -443,6 +443,7 @@ rm nscd/s-stamp
|
||||
%patch56 -p1
|
||||
%patch58
|
||||
%patch59 -p1
|
||||
%patch60
|
||||
%ifarch %arm armv5tel armv7l
|
||||
%patch500
|
||||
%patch501
|
||||
|
||||
Loading…
Reference in New Issue
Block a user