Accepting request 128705 from devel:libraries:c_c++

Fix build with glibc 2.16 (forwarded request 128613 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/128705
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gperftools?expand=0&rev=3
This commit is contained in:
Stephan Kulow 2012-07-23 08:00:41 +00:00 committed by Git OBS Bridge
commit b8f50e68a3
3 changed files with 55 additions and 11 deletions

29
gperftools-glibc216.patch Normal file
View File

@ -0,0 +1,29 @@
Index: gperftools-2.0/src/base/linux_syscall_support.h
===================================================================
--- gperftools-2.0.orig/src/base/linux_syscall_support.h
+++ gperftools-2.0/src/base/linux_syscall_support.h
@@ -250,7 +250,7 @@ struct siginfo;
struct kernel_old_sigaction {
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
unsigned long sa_mask;
unsigned long sa_flags;
@@ -287,13 +287,13 @@ struct kernel_sigaction {
unsigned long sa_flags;
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
struct kernel_sigset_t sa_mask;
#else
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
unsigned long sa_flags;
void (*sa_restorer)(void);

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jul 22 07:47:04 UTC 2012 - aj@suse.de
- replace struct siginfo with siginfo_t since the former is not
available with glibc 2.16 anymore.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 14 13:25:33 UTC 2012 - cfarrell@suse.com Mon May 14 13:25:33 UTC 2012 - cfarrell@suse.com

View File

@ -15,22 +15,29 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: gperftools Name: gperftools
Version: 2.0 Version: 2.0
Release: 0 Release: 0
Group: System/Libraries
License: BSD-3-Clause
Url: http://code.google.com/p/gperftools/ Url: http://code.google.com/p/gperftools/
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Patch4: %{name}-fix_docdir.patch Patch4: %{name}-fix_docdir.patch
Patch11: %{name}_fix_multiple_install_headers.patch Patch11: %{name}_fix_multiple_install_headers.patch
Patch12: %{name}_fix_unassigned_malloc_in_unittest.patch Patch12: %{name}_fix_unassigned_malloc_in_unittest.patch
Patch14: %{name}_gcc46.patch Patch14: %{name}_gcc46.patch
BuildRequires: gcc-c++ pkg-config autoconf automake libtool libunwind-devel Patch15: %{name}-glibc216.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: libunwind-devel
BuildRequires: pkg-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Performance Tools for C++ Summary: Performance Tools for C++
Provides: google-perftools License: BSD-3-Clause
Obsoletes: google-perftools Group: System/Libraries
Provides: google-perftools
Obsoletes: google-perftools
%description %description
The gperftools package contains some utilities to improve and analyze the The gperftools package contains some utilities to improve and analyze the
@ -40,11 +47,12 @@ malloc() and cpu and heap profiling utilities.
%package devel %package devel
Group: System/Libraries
Summary: Performance tools for C++ Summary: Performance tools for C++
Requires: libstdc++-devel, gperftools = %{version} Group: System/Libraries
Provides: google-perftools-devel Requires: gperftools = %{version}
Obsoletes: google-perftools-devel Requires: libstdc++-devel
Provides: google-perftools-devel
Obsoletes: google-perftools-devel
%description devel %description devel
The gperftools-devel package contains static and debug libraries and header The gperftools-devel package contains static and debug libraries and header
@ -58,6 +66,7 @@ files for developing applications that use the gperftools package.
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1
%build %build
autoreconf -fi autoreconf -fi