Index: head/devel/google-perftools/Makefile =================================================================== --- head/devel/google-perftools/Makefile +++ head/devel/google-perftools/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= google-perftools -PORTVERSION= 2.5 +PORTVERSION= 2.6 CATEGORIES= devel MASTER_SITES= https://github.com/gperftools/gperftools/releases/download/gperftools-${PORTVERSION}/ DISTNAME= gperftools-${PORTVERSION} @@ -13,24 +13,40 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libunwind.so:devel/libunwind - BROKEN_powerpc= fails to build: assembly not supported, see PR#94: http://code.google.com/p/google-perftools/issues/detail?id=94&can=1 BROKEN_powerpc64= fails to build: assembly not supported, see PR#94: http://code.google.com/p/google-perftools/issues/detail?id=94&can=1 BROKEN_sparc64= fails to build: assembly not supported, see PR#94: http://code.google.com/p/google-perftools/issues/detail?id=94&can=1 +LIB_DEPENDS= libunwind.so:devel/libunwind + WRKSRC= ${WRKDIR}/gperftools-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/gperftools GNU_CONFIGURE= yes +USES= compiler execinfo gmake libtool USE_LDCONFIG= yes -USES= compiler execinfo libtool TEST_TARGET= check CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lexecinfo OPTIONS_DEFINE= DOCS +OPTIONS_DEFAULT=PAGE8K ALIGN16 +OPTIONS_SINGLE= PAGESIZE ALIGN +OPTIONS_SINGLE_ALIGN= ALIGN8 ALIGN16 +OPTIONS_SINGLE_PAGESIZE=PAGE8K PAGE32K PAGE64K +ALIGN_DESC= The tcmalloc allocation alignment +ALIGN8_DESC= 8 bytes allocation alignment +ALIGN16_DESC= 16 bytes allocation alignment +PAGESIZE_DESC= The tcmalloc internal page size +PAGE8K_DESC= 8K page size +PAGE32K_DESC= 32K page size +PAGE64K_DESC= 64K page size +ALIGN8_CONFIGURE_ON= --with-tcmalloc-alignment=8 +ALIGN16_CONFIGURE_ON= --with-tcmalloc-alignment=16 +PAGE8K_CONFIGURE_ON= --with-tcmalloc-pagesize=8 +PAGE32K_CONFIGURE_ON= --with-tcmalloc-pagesize=32 +PAGE64K_CONFIGURE_ON= --with-tcmalloc-pagesize=64 .include Index: head/devel/google-perftools/distinfo =================================================================== --- head/devel/google-perftools/distinfo +++ head/devel/google-perftools/distinfo @@ -1,2 +1,3 @@ -SHA256 (gperftools-2.5.tar.gz) = 6fa2748f1acdf44d750253e160cf6e2e72571329b42e563b455bde09e9e85173 -SIZE (gperftools-2.5.tar.gz) = 1389081 +TIMESTAMP = 1499352435 +SHA256 (gperftools-2.6.tar.gz) = 87d556694bb1d2c16de34acb9a9db36f7b82b491762ee19e795ef2bef9394daf +SIZE (gperftools-2.6.tar.gz) = 1498776 Index: head/devel/google-perftools/files/patch-Makefile.in =================================================================== --- head/devel/google-perftools/files/patch-Makefile.in +++ head/devel/google-perftools/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2016-03-12 20:07:30 UTC +--- Makefile.in.orig 2017-07-05 03:25:25 UTC +++ Makefile.in @@ -105,10 +105,10 @@ host_triplet = @host@ # changes one day. gcc ignores functions it doesn't understand. @@ -15,30 +15,30 @@ @GCC_TRUE@am__append_3 = -fno-builtin -@@ -1943,7 +1943,7 @@ am__can_run_installinfo = \ +@@ -2019,7 +2019,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 ++am__dist_doc_DATA_DIST = AUTHORS ChangeLog NEWS README \ + README_windows.txt TODO ChangeLog.old docs/index.html \ + docs/designstyle.css docs/pprof_remote_servers.html \ + docs/tcmalloc.html docs/overview.gif docs/pageheap.gif \ +@@ -2261,7 +2261,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 \ ++ ChangeLog 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 = \ +@@ -2499,7 +2499,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_18) doc/tcmalloc.html doc/overview.gif \ - doc/pageheap.gif doc/spanmap.gif doc/threadheap.gif \ ++dist_doc_DATA = AUTHORS ChangeLog NEWS README \ + README_windows.txt TODO ChangeLog.old docs/index.html \ + docs/designstyle.css $(am__append_19) docs/tcmalloc.html \ + docs/overview.gif docs/pageheap.gif docs/spanmap.gif \ Index: head/devel/google-perftools/files/patch-src_pprof =================================================================== --- head/devel/google-perftools/files/patch-src_pprof +++ head/devel/google-perftools/files/patch-src_pprof @@ -1,11 +1,11 @@ ---- src/pprof.orig 2016-03-01 03:36:11 UTC +--- src/pprof.orig 2017-07-06 15:20:46 UTC +++ src/pprof -@@ -4521,7 +4521,7 @@ sub ParseLibraries { +@@ -4520,7 +4520,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) { +- if ($l =~ /^($h)-($h)\s+..x.\s+($h)\s+\S+:\S+\s+\d+\s+(.+\.(so|dll|dylib|bundle|node)((\.\d+)+\w*(\.\d+){0,3})?)$/i) { ++ if ($l =~ /^($h)-($h)\s+..x.\s+($h)\s+\S+:\S+\s+\d+\s+(.+\.(so|dll|dylib|bundle|node)((\.\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); Index: head/devel/google-perftools/pkg-plist =================================================================== --- head/devel/google-perftools/pkg-plist +++ head/devel/google-perftools/pkg-plist @@ -14,33 +14,34 @@ include/gperftools/malloc_extension_c.h include/gperftools/malloc_hook.h include/gperftools/malloc_hook_c.h +include/gperftools/nallocx.h include/gperftools/profiler.h include/gperftools/stacktrace.h include/gperftools/tcmalloc.h lib/libprofiler.a lib/libprofiler.so lib/libprofiler.so.0 -lib/libprofiler.so.0.4.8 +lib/libprofiler.so.0.4.13 lib/libtcmalloc.a lib/libtcmalloc.so lib/libtcmalloc.so.4 -lib/libtcmalloc.so.4.3.0 +lib/libtcmalloc.so.4.4.4 lib/libtcmalloc_and_profiler.a lib/libtcmalloc_and_profiler.so lib/libtcmalloc_and_profiler.so.4 -lib/libtcmalloc_and_profiler.so.4.3.0 +lib/libtcmalloc_and_profiler.so.4.4.4 lib/libtcmalloc_debug.a lib/libtcmalloc_debug.so lib/libtcmalloc_debug.so.4 -lib/libtcmalloc_debug.so.4.3.0 +lib/libtcmalloc_debug.so.4.4.4 lib/libtcmalloc_minimal.a lib/libtcmalloc_minimal.so lib/libtcmalloc_minimal.so.4 -lib/libtcmalloc_minimal.so.4.3.0 +lib/libtcmalloc_minimal.so.4.4.4 lib/libtcmalloc_minimal_debug.a lib/libtcmalloc_minimal_debug.so lib/libtcmalloc_minimal_debug.so.4 -lib/libtcmalloc_minimal_debug.so.4.3.0 +lib/libtcmalloc_minimal_debug.so.4.4.4 libdata/pkgconfig/libprofiler.pc libdata/pkgconfig/libtcmalloc.pc libdata/pkgconfig/libtcmalloc_debug.pc @@ -49,7 +50,7 @@ man/man1/pprof.1.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.old %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README_windows.txt