From nobody Tue Jul 19 08:05:48 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LnBGj0frrz4Wgn1; Tue, 19 Jul 2022 08:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LnBGh75fqz3vGq; Tue, 19 Jul 2022 08:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658217949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTaiQL1ACFpclL+os+DZex0sa9WEMF6im9fk5uuSwsA=; b=qrkdgmRtp2WoDGp4aORu3RklFqjAtwyrMD2ooQa/3W/bPQwTQcrLPS+T2yEon8PIS7Z5x/ CXEgwl0d5BwWVIlOD8e4llJNaAEeMkZxJJ17VQYsYEKnTanrpw0ylIE13EJVk6DoUPJTvG qkZ5US28oVgJTysLBWVd2tRxX84C1zaY+kP2pE1lR1UBdBchC00BfIcHB9EHRBAk8BNntK MOKlGASvPz8/uDzkIOH0tH9KoBQL1xo/XfO5UJwIrqvoZ/gs+2ndvDr4elpk18y/TTdKpX uIWG3CiLOrQTUna8tFcRcqsmMKK6sJZmS7LenreNgrNCcPVbg25Et8LkV0TJ4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LnBGh68Jcz1BSC; Tue, 19 Jul 2022 08:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26J85mQG063127; Tue, 19 Jul 2022 08:05:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26J85mD2063126; Tue, 19 Jul 2022 08:05:48 GMT (envelope-from git) Date: Tue, 19 Jul 2022 08:05:48 GMT Message-Id: <202207190805.26J85mD2063126@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 872bad0df49c - 2022Q3 - devel/google-perftools: Add PROFILER options List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 872bad0df49c1bedbfe242745f41bac4b0fc2530 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658217949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTaiQL1ACFpclL+os+DZex0sa9WEMF6im9fk5uuSwsA=; b=ixvQxvdqtdBfTnuSloR9DStUQNyrbM5JoJd+JawrzhPh101SQ3QWJT3eTOT25VMncVcYXX 69YrlKAREuLDb/NtL3SDCqwXX2AeJAmMANe+YjWymW70j1/XEm56cHiSnldfa61rz+rIC1 fJX+SXjdoevGfjiciVlwGaboerHTJw6/5DCD3T4IqxxrKYp71ZB1B37Yk0gBjtt7g1RqO0 27x4skxcaSvIDBFCcd2of76jdV/rt4QKVyK7B07IXEz1g7ftujNqzxZVSpqoetHkwqtiCF T27+hsweBXuMKhUB0iYM7zINhM0myO2k4FoT2fjimYlb+9D2uMRTb1R+gFyoZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658217949; a=rsa-sha256; cv=none; b=m7G+zIzSsP81kx0zogehR+2u5mimoNKqzmzgzfgfY/nVvphVlJmLdkvsAc/NUK9xEt90ic NEmJa6KaQsyK6e69eJyacI3VGUXAZ8InQLtrQ8ElS2yW5gjZTx/iE2sXJQF7pISYK4IP1X DWpR19g6naN062nnX5+HPpYgHl1py8/qFGTuzFW5RJIA0IdMGbbmtRnAHP4kyC7qdlJsq4 4XUSusJDKTZw0+gF8tIoToZ/a9qHDFWf6PaXvTh4KI88h42l5zGlQFCUuVqc5qXI/LwtJF F1Lvq/0mXfODVjEo0ktXDXsMfEuv2UVhO1qxWoqk4w6YIZ3vZDMZFU1yss1AWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=872bad0df49c1bedbfe242745f41bac4b0fc2530 commit 872bad0df49c1bedbfe242745f41bac4b0fc2530 Author: Yuri Victorovich AuthorDate: 2022-07-19 00:13:48 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-19 08:05:34 +0000 devel/google-perftools: Add PROFILER options Option for CPU profiler is mostly to isolate situations when configure fails to enable it, like on armv6, armv7. Reference: https://github.com/gperftools/gperftools/issues/1355#issuecomment-1188455253 (cherry picked from commit 35bf4d1c97b88bec3bf690701f72113a2b60d78f) --- devel/google-perftools/Makefile | 17 ++++++++++++++++- devel/google-perftools/pkg-plist | 18 +++++++++--------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/devel/google-perftools/Makefile b/devel/google-perftools/Makefile index 8955117cf6bd..cd21d6bcff71 100644 --- a/devel/google-perftools/Makefile +++ b/devel/google-perftools/Makefile @@ -3,6 +3,7 @@ PORTNAME= google-perftools DISTVERSIONPREFIX= gperftools- DISTVERSION= 2.10 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/gperftools/gperftools/releases/download/gperftools-${PORTVERSION}/ DISTNAME= gperftools-${PORTVERSION} @@ -25,11 +26,25 @@ LIBS+= -lexecinfo DOCSDIR= ${PREFIX}/share/doc/gperftools -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS PROFILER OPTIONS_SINGLE= PAGESIZE ALIGN OPTIONS_SINGLE_ALIGN= ALIGN8 ALIGN16 OPTIONS_SINGLE_PAGESIZE= PAGE8K PAGE32K PAGE64K OPTIONS_DEFAULT= PAGE8K ALIGN16 +OPTIONS_DEFAULT_amd64= PROFILER +OPTIONS_DEFINE_aarch64= PROFILER +OPTIONS_DEFINE_amd64= PROFILER +OPTIONS_DEFINE_armv6= # PROFILER is disabled: WARNING: Could not find the PC. Will not try to compile libprofiler. +OPTIONS_DEFINE_armv7= # PROFILER is disabled: WARNING: Could not find the PC. Will not try to compile libprofiler. +OPTIONS_DEFINE_i386= PROFILER +OPTIONS_DEFINE_powerpc= PROFILER +OPTIONS_DEFINE_powerpc64= PROFILER +OPTIONS_DEFINE_powerpc64le= PROFILER +OPTIONS_DEFINE_riscv64= PROFILER +OPTIONS_SUB= yes + +PROFILER_DESC= Enable CPU profiler +PROFILER_CONFIGURE_ENABLE= cpu-profiler ALIGN_DESC= The tcmalloc allocation alignment ALIGN8_DESC= 8 bytes allocation alignment diff --git a/devel/google-perftools/pkg-plist b/devel/google-perftools/pkg-plist index f7d38a336a88..b84c09f06679 100644 --- a/devel/google-perftools/pkg-plist +++ b/devel/google-perftools/pkg-plist @@ -16,21 +16,21 @@ 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 +%%PROFILER%%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.5.5 +%%PROFILER%%lib/libprofiler.a +%%PROFILER%%lib/libprofiler.so +%%PROFILER%%lib/libprofiler.so.0 +%%PROFILER%%lib/libprofiler.so.0.5.5 lib/libtcmalloc.a lib/libtcmalloc.so lib/libtcmalloc.so.4 lib/libtcmalloc.so.4.5.10 -lib/libtcmalloc_and_profiler.a -lib/libtcmalloc_and_profiler.so -lib/libtcmalloc_and_profiler.so.4 -lib/libtcmalloc_and_profiler.so.4.6.5 +%%PROFILER%%lib/libtcmalloc_and_profiler.a +%%PROFILER%%lib/libtcmalloc_and_profiler.so +%%PROFILER%%lib/libtcmalloc_and_profiler.so.4 +%%PROFILER%%lib/libtcmalloc_and_profiler.so.4.6.5 lib/libtcmalloc_debug.a lib/libtcmalloc_debug.so lib/libtcmalloc_debug.so.4