Attachment 169041 Details for Bug 208582 – patch

[patch] patch

google-perftools-2.5.patch (text/plain), 8.32 KB, created by Yuri Victorovich on 2016-04-06 15:57:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2016-04-06 15:57:35 UTC

Size: 8.32 KB

patch

obsolete

>diff -ruN devel/google-perftools/Makefile devel/google-perftools/Makefile
>--- devel/google-perftools/Makefile	2016-04-06 08:54:37.186534000 -0700
>+++ devel/google-perftools/Makefile	2016-04-06 08:48:54.712715000 -0700
>@@ -2,10 +2,9 @@
> # $FreeBSD: head/devel/google-perftools/Makefile 393429 2015-08-02 15:03:19Z tijl $
> 
> PORTNAME=	google-perftools
>-PORTVERSION=	2.4
>-PORTREVISION=	1
>+PORTVERSION=	2.5
> CATEGORIES=	devel
>-MASTER_SITES=	https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/
>+MASTER_SITES=	https://github.com/gperftools/gperftools/releases/download/gperftools-2.5/
> DISTNAME=	gperftools-${PORTVERSION}
> 
> MAINTAINER=	yuri@rawbw.com
>@@ -14,7 +13,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-PROJECTHOST=	gperftools
>+LIB_DEPENDS+=	libunwind.so:${PORTSDIR}/devel/libunwind
> 
> WRKSRC=		${WRKDIR}/gperftools-${PORTVERSION}
> DOCSDIR=	${PREFIX}/share/doc/gperftools
>@@ -64,11 +63,12 @@
> post-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/libdata
> 	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata
>+	${MV} ${STAGEDIR}${PREFIX}/bin/pprof ${STAGEDIR}${PREFIX}/bin/perftools-pprof
> 
> post-stage:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
> 
>-# four of the tests are known to fail on 7.0, uncomment this as soon as this is fixed
>+# Two of the tests are known to fail on FreeBSD 10, uncomment this as soon as this is fixed
> #regression-test: check
> 
> check: build
>diff -ruN devel/google-perftools/distinfo devel/google-perftools/distinfo
>--- devel/google-perftools/distinfo	2016-04-06 08:54:37.189116000 -0700
>+++ devel/google-perftools/distinfo	2016-04-05 22:06:58.066598000 -0700
>@@ -1,2 +1,2 @@
>-SHA256 (gperftools-2.4.tar.gz) = 982a37226eb42f40714e26b8076815d5ea677a422fb52ff8bfca3704d9c30a2d
>-SIZE (gperftools-2.4.tar.gz) = 1346075
>+SHA256 (gperftools-2.5.tar.gz) = 6fa2748f1acdf44d750253e160cf6e2e72571329b42e563b455bde09e9e85173
>+SIZE (gperftools-2.5.tar.gz) = 1389081
>diff -ruN devel/google-perftools/files/patch-Makefile.in devel/google-perftools/files/patch-Makefile.in
>--- devel/google-perftools/files/patch-Makefile.in	2016-04-06 08:54:37.174979000 -0700
>+++ devel/google-perftools/files/patch-Makefile.in	2016-04-05 23:23:05.414624000 -0700
>@@ -1,20 +1,44 @@
>---- Makefile.in.orig	2010-08-04 20:17:38.000000000 +0000
>-+++ Makefile.in	2010-08-27 14:22:38.000000000 +0000
>-@@ -1514,7 +1514,7 @@
>- build_vendor = @build_vendor@
>- datadir = @datadir@
>- datarootdir = @datarootdir@
>--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
>-+docdir = $(prefix)/share/doc/$(PACKAGE)
>- dvidir = @dvidir@
>- exec_prefix = @exec_prefix@
>- host = @host@
>-@@ -1609,7 +1609,7 @@
>+--- Makefile.in.orig	2016-03-12 20:07:30 UTC
>++++ Makefile.in
>+@@ -105,10 +105,10 @@ host_triplet = @host@
>+ # changes one day.  gcc ignores functions it doesn't understand.
>+ @GCC_TRUE@am__append_2 = -Wall -Wwrite-strings -Woverloaded-virtual \
>+ @GCC_TRUE@               -Wno-sign-compare \
>+-@GCC_TRUE@               -fno-builtin-malloc -fno-builtin-free -fno-builtin-realloc \
>+-@GCC_TRUE@               -fno-builtin-calloc -fno-builtin-cfree \
>+-@GCC_TRUE@               -fno-builtin-memalign -fno-builtin-posix_memalign \
>+-@GCC_TRUE@               -fno-builtin-valloc -fno-builtin-pvalloc
>++@GCC_TRUE@                  \
>++@GCC_TRUE@                 \
>++@GCC_TRUE@                 \
>++@GCC_TRUE@                
>+ 
>+ @GCC_TRUE@am__append_3 = -fno-builtin
>+ 
>+@@ -1943,7 +1943,7 @@ am__can_run_installinfo = \
>+ man1dir = $(mandir)/man1
>+ NROFF = nroff
>+ MANS = $(dist_man_MANS)
>+-am__dist_doc_DATA_DIST = AUTHORS COPYING ChangeLog INSTALL NEWS README \
>++am__dist_doc_DATA_DIST = AUTHORS ChangeLog INSTALL NEWS README \
>+ 	README_windows.txt TODO doc/index.html doc/designstyle.css \
>+ 	doc/pprof_remote_servers.html doc/tcmalloc.html \
>+ 	doc/overview.gif doc/pageheap.gif doc/spanmap.gif \
>+@@ -2185,7 +2185,7 @@ am__DIST_COMMON = $(dist_man_MANS) $(src
>+ 	$(top_srcdir)/src/config.h.in \
>+ 	$(top_srcdir)/src/gperftools/tcmalloc.h.in \
>+ 	$(top_srcdir)/src/windows/gperftools/tcmalloc.h.in AUTHORS \
>+-	COPYING ChangeLog INSTALL NEWS README TODO compile \
>++	ChangeLog INSTALL NEWS README TODO compile \
>+ 	config.guess config.sub depcomp install-sh ltmain.sh missing \
>+ 	test-driver
>+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>+@@ -2429,7 +2429,7 @@ googleinclude_HEADERS = \
>  # noinst doesn't seem to work with data.  I separate them out anyway, in case
>  # one day we figure it out.  Regardless, installing the dot files isn't the
>  # end of the world.
> -dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README \
> +dist_doc_DATA = AUTHORS ChangeLog INSTALL NEWS README \
>  	README_windows.txt TODO doc/index.html doc/designstyle.css \
>- 	$(am__append_12) doc/tcmalloc.html doc/overview.gif \
>+ 	$(am__append_18) doc/tcmalloc.html doc/overview.gif \
>  	doc/pageheap.gif doc/spanmap.gif doc/threadheap.gif \
>diff -ruN devel/google-perftools/files/patch-pprof devel/google-perftools/files/patch-pprof
>--- devel/google-perftools/files/patch-pprof	2016-04-06 08:54:37.178406000 -0700
>+++ devel/google-perftools/files/patch-pprof	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- src/pprof
>-+++ src/pprof
>-@@ -4405,7 +4405,7 @@
>-     my $finish;
>-     my $offset;
>-     my $lib;
>--    if ($l =~ /^($h)-($h)\s+..x.\s+($h)\s+\S+:\S+\s+\d+\s+(.+\.(so|dll|dylib|bundle)((\.\d+)+\w*(\.\d+){0,3})?)$/i) {
>-+    if ($l =~ /^($h)-($h)\s+..x.\s+($h)\s+\S+:\S+\s+\d+\s+(.+\.(so|dll|dylib|bundle)((\.\d+)+\w*(\.\d+){0,3})?)\s+[A-Z]+\s+[\-0-9]+$/i) {
>-       # Full line from /proc/self/maps.  Example:
>-       #   40000000-40015000 r-xp 00000000 03:01 12845071   /lib/ld-2.3.2.so
>-       $start = HexExtend($1);
>diff -ruN devel/google-perftools/files/patch-src_pprof devel/google-perftools/files/patch-src_pprof
>--- devel/google-perftools/files/patch-src_pprof	1969-12-31 16:00:00.000000000 -0800
>+++ devel/google-perftools/files/patch-src_pprof	2016-04-05 23:23:05.414628000 -0700
>@@ -0,0 +1,11 @@
>+--- src/pprof.orig	2016-03-01 03:36:11 UTC
>++++ src/pprof
>+@@ -4521,7 +4521,7 @@ sub ParseLibraries {
>+     my $finish;
>+     my $offset;
>+     my $lib;
>+-    if ($l =~ /^($h)-($h)\s+..x.\s+($h)\s+\S+:\S+\s+\d+\s+(.+\.(so|dll|dylib|bundle)((\.\d+)+\w*(\.\d+){0,3})?)$/i) {
>++    if ($l =~ /^($h)-($h)\s+..x.\s+($h)\s+\S+:\S+\s+\d+\s+(.+\.(so|dll|dylib|bundle)((\.\d+)+\w*(\.\d+){0,3})?)\s+[A-Z]+\s+[\-0-9]+$/i) {
>+       # Full line from /proc/self/maps.  Example:
>+       #   40000000-40015000 r-xp 00000000 03:01 12845071   /lib/ld-2.3.2.so
>+       $start = HexExtend($1);
>diff -ruN devel/google-perftools/files/patch-static_vars.cc devel/google-perftools/files/patch-static_vars.cc
>--- devel/google-perftools/files/patch-static_vars.cc	2016-04-06 08:54:37.181440000 -0700
>+++ devel/google-perftools/files/patch-static_vars.cc	1969-12-31 16:00:00.000000000 -0800
>@@ -1,10 +0,0 @@
>---- src/static_vars.cc	2014-01-14 17:23:28.000000000 -0800
>-+++ src/static_vars.cc	2014-01-14 17:28:39.000000000 -0800
>-@@ -37,6 +37,7 @@
>- #include "common.h"
>- #include "sampler.h"           // for Sampler
>- #include "base/googleinit.h"
>-+#include <pthread.h>
>- 
>- namespace tcmalloc {
>- 
>diff -ruN devel/google-perftools/pkg-plist devel/google-perftools/pkg-plist
>--- devel/google-perftools/pkg-plist	2016-04-06 08:54:37.183785000 -0700
>+++ devel/google-perftools/pkg-plist	2016-04-05 22:00:56.197214000 -0700
>@@ -1,4 +1,4 @@
>-bin/pprof
>+bin/perftools-pprof
> include/google/heap-checker.h
> include/google/heap-profiler.h
> include/google/malloc_extension.h
>@@ -20,27 +20,27 @@
> lib/libprofiler.a
> lib/libprofiler.so
> lib/libprofiler.so.0
>-lib/libprofiler.so.0.4.5
>+lib/libprofiler.so.0.4.8
> lib/libtcmalloc.a
> lib/libtcmalloc.so
> lib/libtcmalloc.so.4
>-lib/libtcmalloc.so.4.2.6
>+lib/libtcmalloc.so.4.3.0
> lib/libtcmalloc_and_profiler.a
> lib/libtcmalloc_and_profiler.so
> lib/libtcmalloc_and_profiler.so.4
>-lib/libtcmalloc_and_profiler.so.4.2.6
>+lib/libtcmalloc_and_profiler.so.4.3.0
> lib/libtcmalloc_debug.a
> lib/libtcmalloc_debug.so
> lib/libtcmalloc_debug.so.4
>-lib/libtcmalloc_debug.so.4.2.6
>+lib/libtcmalloc_debug.so.4.3.0
> lib/libtcmalloc_minimal.a
> lib/libtcmalloc_minimal.so
> lib/libtcmalloc_minimal.so.4
>-lib/libtcmalloc_minimal.so.4.2.6
>+lib/libtcmalloc_minimal.so.4.3.0
> lib/libtcmalloc_minimal_debug.a
> lib/libtcmalloc_minimal_debug.so
> lib/libtcmalloc_minimal_debug.so.4
>-lib/libtcmalloc_minimal_debug.so.4.2.6
>+lib/libtcmalloc_minimal_debug.so.4.3.0
> libdata/pkgconfig/libprofiler.pc
> libdata/pkgconfig/libtcmalloc.pc
> libdata/pkgconfig/libtcmalloc_debug.pc

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 208582: 169041