From 05f8d3e7ebd972b5971bcad9bed4e1f21dffc43f Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sat, 1 Oct 2016 18:53:57 +0200 Subject: [PATCH] gperftools: update to 2.5. --- .../gperftools/patches/musl-__off64_t.patch | 61 ------------------- srcpkgs/gperftools/template | 15 ++--- 2 files changed, 8 insertions(+), 68 deletions(-) delete mode 100644 srcpkgs/gperftools/patches/musl-__off64_t.patch diff --git a/srcpkgs/gperftools/patches/musl-__off64_t.patch b/srcpkgs/gperftools/patches/musl-__off64_t.patch deleted file mode 100644 index bfaba5f632d..00000000000 --- a/srcpkgs/gperftools/patches/musl-__off64_t.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- src/malloc_hook_mmap_linux.h 2014-12-06 23:51:40.000000000 +0100 -+++ src/malloc_hook_mmap_linux.h 2015-08-26 17:19:59.295705896 +0200 -@@ -56,7 +56,7 @@ - - static inline void* do_mmap64(void *start, size_t length, - int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - return sys_mmap(start, length, prot, flags, fd, offset); - } - -@@ -67,7 +67,7 @@ - - static inline void* do_mmap64(void *start, size_t length, - int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - void *result; - - // Try mmap2() unless it's not supported -@@ -138,7 +138,7 @@ - - extern "C" { - void* mmap64(void *start, size_t length, int prot, int flags, -- int fd, __off64_t offset ) __THROW -+ int fd, off64_t offset ) __THROW - ATTRIBUTE_SECTION(malloc_hook); - void* mmap(void *start, size_t length,int prot, int flags, - int fd, off_t offset) __THROW -@@ -153,7 +153,7 @@ - } - - extern "C" void* mmap64(void *start, size_t length, int prot, int flags, -- int fd, __off64_t offset) __THROW { -+ int fd, off64_t offset) __THROW { - MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); - void *result; - if (!MallocHook::InvokeMmapReplacement( ---- src/base/linux_syscall_support.h 2014-12-06 23:51:40.000000000 +0100 -+++ src/base/linux_syscall_support.h 2015-08-26 17:24:29.981711588 +0200 -@@ -2165,9 +2165,9 @@ - int, t, int, p) - #endif - #if defined(__x86_64__) -- /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ -+ /* Need to make sure off64_t isn't truncated to 32-bits under x32. */ - LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, -- __off64_t o) { -+ off64_t o) { - LSS_BODY(6, void*, mmap, LSS_SYSCALL_ARG(s), LSS_SYSCALL_ARG(l), - LSS_SYSCALL_ARG(p), LSS_SYSCALL_ARG(f), - LSS_SYSCALL_ARG(d), (uint64_t)(o)); -@@ -2204,7 +2204,7 @@ - LSS_INLINE _syscall6(void*, mmap, void*, s, - size_t, l, int, p, - int, f, int, d, -- __off64_t, o) -+ off64_t, o) - LSS_INLINE int LSS_NAME(sigaction)(int signum, - const struct kernel_sigaction *act, - struct kernel_sigaction *oldact) { diff --git a/srcpkgs/gperftools/template b/srcpkgs/gperftools/template index 6f793d0c425..ed5bf965b6b 100644 --- a/srcpkgs/gperftools/template +++ b/srcpkgs/gperftools/template @@ -1,18 +1,19 @@ # Template build file for 'gperftools' pkgname=gperftools -version=2.4 -revision=2 +version=2.5 +revision=1 build_style=gnu-configure short_desc="Multi-threaded malloc() and performance analysis tools" maintainer="Enno Boland " license="BSD-3-Clause" -homepage="http://gperftools.googlecode.com" -distfiles="https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-$version.zip" -checksum=2d80f7b0126d73f5cda70f36d2a4ba88da93b1775e9fd2acf773bb2854e97a38 -hostmakedepends="unzip" +homepage="https://github.com/gperftools/gperftools" +distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz" +checksum=6fa2748f1acdf44d750253e160cf6e2e72571329b42e563b455bde09e9e85173 makedepends="libunwind-devel" -pre_configure() { +post_extract() { + sed -i -e 's/__off64_t/off64_t/' \ + src/base/linux_syscall_support.h src/malloc_hook_mmap_linux.h sed -i -e "s/^UNWIND_LIBS = .*/UNWIND_LIBS = -lunwind/" Makefile.in }