sync to rawhide
This commit is contained in:
Tom Callaway
parent
cabf9ead3a
commit
93b8ac81d9
|
|
@ -0,0 +1,66 @@
|
|||
diff -ru gperftools-2.4/src/base/linux_syscall_support.h gperftools-2.4-fixed/src/base/linux_syscall_support.h
|
||||
--- gperftools-2.4/src/base/linux_syscall_support.h 2014-12-06 23:51:40.000000000 +0100
|
||||
+++ gperftools-2.4-fixed/src/base/linux_syscall_support.h 2015-06-01 16:51:03.725616215 +0200
|
||||
@@ -83,7 +83,6 @@
|
||||
* sys_fcntl(
|
||||
* sys_fstat(
|
||||
* sys_futex(
|
||||
- * sys_futex1(
|
||||
* sys_getcpu(
|
||||
* sys_getdents64(
|
||||
* sys_getppid(
|
||||
@@ -2094,9 +2093,11 @@
|
||||
int, c, long, a)
|
||||
LSS_INLINE _syscall2(int, fstat, int, f,
|
||||
struct kernel_stat*, b)
|
||||
- LSS_INLINE _syscall4(int, futex, int*, a,
|
||||
+ LSS_INLINE _syscall6(int, futex, int*, a,
|
||||
int, o, int, v,
|
||||
- struct kernel_timespec*, t)
|
||||
+ struct kernel_timespec*, t,
|
||||
+ int*, a2,
|
||||
+ int, v3)
|
||||
#ifdef __NR_getdents64
|
||||
LSS_INLINE _syscall3(int, getdents64, int, f,
|
||||
struct kernel_dirent64*, d, int, c)
|
||||
diff -ru gperftools-2.4/src/base/spinlock_linux-inl.h gperftools-2.4-fixed/src/base/spinlock_linux-inl.h
|
||||
--- gperftools-2.4/src/base/spinlock_linux-inl.h 2014-12-06 23:51:40.000000000 +0100
|
||||
+++ gperftools-2.4-fixed/src/base/spinlock_linux-inl.h 2015-06-01 16:51:03.725616215 +0200
|
||||
@@ -51,15 +51,10 @@
|
||||
int x = 0;
|
||||
// futexes are ints, so we can use them only when
|
||||
// that's the same size as the lockword_ in SpinLock.
|
||||
-#ifdef __arm__
|
||||
- // ARM linux doesn't support sys_futex1(void*, int, int, struct timespec*);
|
||||
- have_futex = 0;
|
||||
-#else
|
||||
have_futex = (sizeof (Atomic32) == sizeof (int) &&
|
||||
- sys_futex(&x, FUTEX_WAKE, 1, 0) >= 0);
|
||||
-#endif
|
||||
+ sys_futex(&x, FUTEX_WAKE, 1, NULL, NULL, 0) >= 0);
|
||||
if (have_futex &&
|
||||
- sys_futex(&x, FUTEX_WAKE | futex_private_flag, 1, 0) < 0) {
|
||||
+ sys_futex(&x, FUTEX_WAKE | futex_private_flag, 1, NULL, NULL, 0) < 0) {
|
||||
futex_private_flag = 0;
|
||||
}
|
||||
}
|
||||
@@ -85,7 +85,8 @@
|
||||
tm.tv_nsec *= 16; // increase the delay; we expect explicit wakeups
|
||||
sys_futex(reinterpret_cast<int *>(const_cast<Atomic32 *>(w)),
|
||||
FUTEX_WAIT | futex_private_flag,
|
||||
- value, reinterpret_cast<struct kernel_timespec *>(&tm));
|
||||
+ value, reinterpret_cast<struct kernel_timespec *>(&tm),
|
||||
+ NULL, 0);
|
||||
} else {
|
||||
nanosleep(&tm, NULL);
|
||||
}
|
||||
@@ -96,7 +97,8 @@
|
||||
void SpinLockWake(volatile Atomic32 *w, bool all) {
|
||||
if (have_futex) {
|
||||
sys_futex(reinterpret_cast<int *>(const_cast<Atomic32 *>(w)),
|
||||
- FUTEX_WAKE | futex_private_flag, all? INT_MAX : 1, 0);
|
||||
+ FUTEX_WAKE | futex_private_flag, all? INT_MAX : 1,
|
||||
+ NULL, NULL, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,18 +1,21 @@
|
|||
# This package used to be called "google-perftools", but it was renamed on 2012-02-03.
|
||||
|
||||
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||
|
||||
Name: gperftools
|
||||
Version: 2.1
|
||||
Release: 1%{?dist}
|
||||
Version: 2.4
|
||||
Release: 5%{?dist}
|
||||
License: BSD
|
||||
Group: Development/Tools
|
||||
Summary: Very fast malloc and performance analysis tools
|
||||
URL: http://code.google.com/p/gperftools/
|
||||
Source0: http://gperftools.googlecode.com/files/%{name}-%{version}.tar.gz
|
||||
ExclusiveArch: %{ix86} x86_64 ppc ppc64 %{arm}
|
||||
%ifnarch ppc ppc64
|
||||
Source0: https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/%{name}-%{version}.tar.gz
|
||||
# https://code.google.com/p/gperftools/issues/detail?id=693
|
||||
Patch0: gperftools-arm-has-futex.patch
|
||||
ExcludeArch: s390 s390x
|
||||
%ifnarch ppc %{power64}
|
||||
BuildRequires: libunwind-devel
|
||||
%endif
|
||||
BuildRequires: autoconf, automake, libtool
|
||||
Requires: gperftools-devel = %{version}-%{release}
|
||||
Requires: pprof = %{version}-%{release}
|
||||
|
||||
|
|
@ -55,18 +58,17 @@ Pprof is a heap and CPU profiler tool, part of the gperftools suite.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .armfutex
|
||||
|
||||
# Fix end-of-line encoding
|
||||
sed -i 's/\r//' README_windows.txt
|
||||
|
||||
# No need to have exec permissions on source code
|
||||
chmod -x src/sampler.h src/sampler.cc
|
||||
|
||||
autoreconf -i
|
||||
chmod -x src/*.h src/*.cc
|
||||
|
||||
%build
|
||||
CFLAGS=`echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unused-local-typedefs -DTCMALLOC_LARGE_PAGES | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' | sed -e 's|-fexceptions||g'`
|
||||
CXXFLAGS=`echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unused-local-typedefs -DTCMALLOC_LARGE_PAGES | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' | sed -e 's|-fexceptions||g'`
|
||||
CFLAGS=`echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unused-local-typedefs -DTCMALLOC_LARGE_PAGES | sed -e 's|-fexceptions||g'`
|
||||
CXXFLAGS=`echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unused-local-typedefs -DTCMALLOC_LARGE_PAGES | sed -e 's|-fexceptions||g'`
|
||||
%configure --disable-static
|
||||
|
||||
# Bad rpath!
|
||||
|
|
@ -76,14 +78,11 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|||
make
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version}/ install
|
||||
make DESTDIR=%{buildroot} docdir=%{_pkgdocdir}/ install
|
||||
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
|
||||
|
||||
# Zero files
|
||||
rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/NEWS
|
||||
|
||||
# Delete useless files
|
||||
rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL
|
||||
rm -rf %{buildroot}%{_pkgdocdir}/INSTALL
|
||||
|
||||
%check
|
||||
# http://code.google.com/p/google-perftools/issues/detail?id=153
|
||||
|
|
@ -102,7 +101,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL
|
|||
%{_mandir}/man1/*
|
||||
|
||||
%files devel
|
||||
%{_docdir}/%{name}-%{version}/
|
||||
%{_pkgdocdir}/
|
||||
%{_includedir}/google/
|
||||
%{_includedir}/gperftools/
|
||||
%{_libdir}/*.so
|
||||
|
|
@ -112,6 +111,48 @@ rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL
|
|||
%{_libdir}/*.so.*
|
||||
|
||||
%changelog
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue Jun 9 2015 Tom Callaway <spot@fedoraproject.org> - 2.4-4
|
||||
- fix modern futex handling (thanks to Paolo Bonzini)
|
||||
|
||||
* Mon Jun 1 2015 Tom Callaway <spot@fedoraproject.org> - 2.4-3
|
||||
- enable futex for ARM
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.4-2
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Fri Mar 27 2015 Tom Callaway <spot@fedoraproject.org> 2.4-1
|
||||
- update to 2.4
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Thu Jul 10 2014 Dan Horák <dan[at]danny.cz> - 2.2.1-1
|
||||
- Update to new upstream 2.2.1 release
|
||||
- Fixes build on ppc arches
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Jun 4 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.2-1
|
||||
- Update to new upstream 2.2 release
|
||||
- Add support for new arches (aarch64, ppc64le, mips)
|
||||
|
||||
* Tue May 13 2014 Jaromir Capik <jcapik@redhat.com> - 2.1-5
|
||||
- Replacing ppc64 with the power64 macro (#1077632)
|
||||
|
||||
* Sat Jan 4 2014 Tom Callaway <spot@fedoraproject.org> - 2.1-4
|
||||
- re-enable FORTIFY_SOURCE
|
||||
|
||||
* Fri Dec 6 2013 Ville Skyttä <ville.skytta@iki.fi> - 2.1-3
|
||||
- Install docs to %%{_pkgdocdir} where available (#993798), include NEWS.
|
||||
- Fix bogus date in %%changelog.
|
||||
|
||||
* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 2.1-2
|
||||
- Perl 5.18 rebuild
|
||||
|
||||
* Wed Jul 31 2013 Tom Callaway <spot@fedoraproject.org> - 2.1-1
|
||||
- update to 2.1 (fixes arm)
|
||||
- disable -fexceptions, as that breaks things on el6, possibly arm
|
||||
|
|
@ -269,7 +310,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL
|
|||
* Mon Apr 23 2007 Tom "spot" Callaway <tcallawa@redhat.com> 0.91-1
|
||||
- alright, lets see if this works now.
|
||||
|
||||
* Wed Oct 13 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.3-2
|
||||
* Wed Oct 12 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.3-2
|
||||
- change group to Development/Tools
|
||||
|
||||
* Mon Oct 10 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.3-1
|
||||
|
|
|
|||
Loading…
Reference in New Issue