Index: devel/google-perftools/Makefile =================================================================== --- devel/google-perftools/Makefile +++ devel/google-perftools/Makefile @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= google-perftools -PORTVERSION= 2.6.1 -PORTREVISION= 1 +DISTVERSIONPREFIX= gperftools- +DISTVERSION= 2.6.3 CATEGORIES= devel MASTER_SITES= https://github.com/gperftools/gperftools/releases/download/gperftools-${PORTVERSION}/ DISTNAME= gperftools-${PORTVERSION} -MAINTAINER= yuri@rawbw.com +MAINTAINER= yuri@FreeBSD.org COMMENT= Fast, multi-threaded malloc() and nifty performance analysis tools LICENSE= BSD3CLAUSE @@ -20,21 +20,23 @@ LIB_DEPENDS= libunwind.so:devel/libunwind -WRKSRC= ${WRKDIR}/gperftools-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/gperftools -GNU_CONFIGURE= yes USES= compiler gmake libtool +GNU_CONFIGURE= yes USE_LDCONFIG= yes TEST_TARGET= check LIBS+= -lexecinfo -OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=PAGE8K ALIGN16 -OPTIONS_SINGLE= PAGESIZE ALIGN +PLIST_SUB= SHL3=4.5.1 SHL1=4 + +OPTIONS_DEFINE= DOCS +OPTIONS_SINGLE= PAGESIZE ALIGN OPTIONS_SINGLE_ALIGN= ALIGN8 ALIGN16 -OPTIONS_SINGLE_PAGESIZE=PAGE8K PAGE32K PAGE64K +OPTIONS_SINGLE_PAGESIZE= PAGE8K PAGE32K PAGE64K +OPTIONS_DEFAULT= PAGE8K ALIGN16 + ALIGN_DESC= The tcmalloc allocation alignment ALIGN8_DESC= 8 bytes allocation alignment ALIGN16_DESC= 16 bytes allocation alignment @@ -42,12 +44,15 @@ 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 +PORTDOCS= * + .include .if ${COMPILER_TYPE} == "clang" && !defined(USE_GCC) @@ -59,18 +64,6 @@ CONFIGURE_ARGS+=--enable-frame-pointers .endif -post-patch: -.if ${COMPILER_TYPE} == "clang" && !defined(USE_GCC) - @${REINPLACE_CMD} -Ee \ - 's|-fno-builtin-[a-z_]+||g' \ - ${WRKSRC}/Makefile.in -.endif - -post-patch-DOCS-off: - @${REINPLACE_CMD} -e \ - '/^install-data-am:/ s|install-dist_docDATA||' \ - ${WRKSRC}/Makefile.in - post-build: @${ECHO} @${ECHO} "Please run 'make check' (requires bash)." @@ -80,7 +73,6 @@ post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/pprof ${STAGEDIR}${PREFIX}/bin/perftools-pprof - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.* .include Index: devel/google-perftools/distinfo =================================================================== --- devel/google-perftools/distinfo +++ devel/google-perftools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499701249 -SHA256 (gperftools-2.6.1.tar.gz) = 38b467eb42a028f253d227fbc428263cb39e6c8687c047466aa2ce5bb4699d81 -SIZE (gperftools-2.6.1.tar.gz) = 1500962 +TIMESTAMP = 1515092539 +SHA256 (gperftools-2.6.3.tar.gz) = 314b2ff6ed95cc0763704efb4fb72d0139e1c381069b9e17a619006bee8eee9f +SIZE (gperftools-2.6.3.tar.gz) = 1510420 Index: devel/google-perftools/files/patch-Makefile.am =================================================================== --- /dev/null +++ devel/google-perftools/files/patch-Makefile.am @@ -0,0 +1,13 @@ +--- Makefile.am.orig 2017-12-09 17:59:37 UTC ++++ Makefile.am +@@ -133,8 +133,8 @@ googleinclude_HEADERS = \ + # Add your documentation files (in doc/) in addition to these + # top-level boilerplate files. Also add a TODO file if you have one. + # We'll add to this later, on a library-by-library basis +-dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README_windows.txt \ +- TODO ChangeLog.old ++dist_doc_DATA = AUTHORS NEWS README README_windows.txt ++ + + # The libraries (.so's) you want to install + # We'll add to this later, on a library-by-library basis Index: devel/google-perftools/files/patch-Makefile.in =================================================================== --- devel/google-perftools/files/patch-Makefile.in +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - @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 - -@@ -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 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 NEWS README TODO compile \ - config.guess config.sub depcomp install-sh ltmain.sh missing \ - test-driver - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -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 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: devel/google-perftools/pkg-plist =================================================================== --- devel/google-perftools/pkg-plist +++ devel/google-perftools/pkg-plist @@ -21,79 +21,30 @@ lib/libprofiler.a lib/libprofiler.so lib/libprofiler.so.0 -lib/libprofiler.so.0.4.14 +lib/libprofiler.so.0.4.16 lib/libtcmalloc.a lib/libtcmalloc.so -lib/libtcmalloc.so.4 -lib/libtcmalloc.so.4.4.5 +lib/libtcmalloc.so.%%SHL1%% +lib/libtcmalloc.so.%%SHL3%% lib/libtcmalloc_and_profiler.a lib/libtcmalloc_and_profiler.so -lib/libtcmalloc_and_profiler.so.4 -lib/libtcmalloc_and_profiler.so.4.4.5 +lib/libtcmalloc_and_profiler.so.%%SHL1%% +lib/libtcmalloc_and_profiler.so.%%SHL3%% lib/libtcmalloc_debug.a lib/libtcmalloc_debug.so -lib/libtcmalloc_debug.so.4 -lib/libtcmalloc_debug.so.4.4.5 +lib/libtcmalloc_debug.so.%%SHL1%% +lib/libtcmalloc_debug.so.%%SHL3%% lib/libtcmalloc_minimal.a lib/libtcmalloc_minimal.so -lib/libtcmalloc_minimal.so.4 -lib/libtcmalloc_minimal.so.4.4.5 +lib/libtcmalloc_minimal.so.%%SHL1%% +lib/libtcmalloc_minimal.so.%%SHL3%% lib/libtcmalloc_minimal_debug.a lib/libtcmalloc_minimal_debug.so -lib/libtcmalloc_minimal_debug.so.4 -lib/libtcmalloc_minimal_debug.so.4.4.5 +lib/libtcmalloc_minimal_debug.so.%%SHL1%% +lib/libtcmalloc_minimal_debug.so.%%SHL3%% libdata/pkgconfig/libprofiler.pc libdata/pkgconfig/libtcmalloc.pc libdata/pkgconfig/libtcmalloc_debug.pc libdata/pkgconfig/libtcmalloc_minimal.pc libdata/pkgconfig/libtcmalloc_minimal_debug.pc man/man1/pprof.1.gz -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.old -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README_windows.txt -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/cpuprofile-fileformat.html -%%PORTDOCS%%%%DOCSDIR%%/cpuprofile.html -%%PORTDOCS%%%%DOCSDIR%%/designstyle.css -%%PORTDOCS%%%%DOCSDIR%%/heap-example1.png -%%PORTDOCS%%%%DOCSDIR%%/heapprofile.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/overview.dot -%%PORTDOCS%%%%DOCSDIR%%/overview.gif -%%PORTDOCS%%%%DOCSDIR%%/pageheap.dot -%%PORTDOCS%%%%DOCSDIR%%/pageheap.gif -%%PORTDOCS%%%%DOCSDIR%%/pprof-test-big.gif -%%PORTDOCS%%%%DOCSDIR%%/pprof-test.gif -%%PORTDOCS%%%%DOCSDIR%%/pprof-vsnprintf-big.gif -%%PORTDOCS%%%%DOCSDIR%%/pprof-vsnprintf.gif -%%PORTDOCS%%%%DOCSDIR%%/pprof_remote_servers.html -%%PORTDOCS%%%%DOCSDIR%%/spanmap.dot -%%PORTDOCS%%%%DOCSDIR%%/spanmap.gif -%%PORTDOCS%%%%DOCSDIR%%/t-test1.times.txt -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.1024.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.128.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.131072.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.16384.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.2048.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.256.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.32768.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.4096.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.512.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.64.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.65536.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspercpusec.vs.threads.8192.bytes.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspersec.vs.size.1.threads.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspersec.vs.size.12.threads.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspersec.vs.size.16.threads.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspersec.vs.size.2.threads.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspersec.vs.size.20.threads.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspersec.vs.size.3.threads.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspersec.vs.size.4.threads.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspersec.vs.size.5.threads.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc-opspersec.vs.size.8.threads.png -%%PORTDOCS%%%%DOCSDIR%%/tcmalloc.html -%%PORTDOCS%%%%DOCSDIR%%/threadheap.dot -%%PORTDOCS%%%%DOCSDIR%%/threadheap.gif