From nobody Mon May 09 11:13:23 2022 X-Original-To: dev-commits-ports-all@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 AF3F81AC9B44; Mon, 9 May 2022 11:13:23 +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 4Kxdnv4Vkxz3H4C; Mon, 9 May 2022 11:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652094803; 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=7k+PYFh0t7LEOzRughX74ZHjHEBOwTZkRORFLJ5y2r8=; b=sqVIJjCPep4eEOZOy5Z7fGuL5Jpg9t1ThpQdVlkBBtv3W7/7SitBEljC0EL4BCrKaiHsHX YNrUbDYsQB+93oJjFPR8pBWITN8qc1nJAwwnhya2FF/kz05ZWzhaqcfFzaSyUBjHpoJu8P DbQsCmGqypFimHPcPqB2ecXZ/4sZVtxM84hAuIx0NMSCeJMdVMKxNOrquoT0M2N3VGnkYl EACFepiRzq914B0Y0riHhzl8V2hwQq4OPGRDzsDQb4gjAxx+LhuIZ+oojHxW51KVpvpDf+ eaEILi9++Zq3yfKkwimN/R9QqRiepW5t3KjFaphW8FxH7VGODhPC1WABRblLHw== 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 7B7797A5B; Mon, 9 May 2022 11:13:23 +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 249BDNHS024634; Mon, 9 May 2022 11:13:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249BDNb1024633; Mon, 9 May 2022 11:13:23 GMT (envelope-from git) Date: Mon, 9 May 2022 11:13:23 GMT Message-Id: <202205091113.249BDNb1024633@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 1ae49930c7f0 - main - devel/heaptrack: fix build on 14- List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ae49930c7f079112577e62f7f4c0e0f9360a051 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652094803; 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=7k+PYFh0t7LEOzRughX74ZHjHEBOwTZkRORFLJ5y2r8=; b=GtKaIg47bCK7QiaUw7Xm2jnk6pBlvWPX7sz6fgl+O1N025JBH+Dc9mAnmh2fadhaOqJInU zWwgvRAtidVIwZdXTrPrn5V31k5FlOCWPP3it0PaUK0sl82Gdn15zJ6cFGVusoZ8SLlWTn RioRzrtrc+e7AdpXDX7rZdA44Grf0uz8A4gCHlwGCdQuO5nFoI2eiQYUF+NiktUSdALWZG 0KNJ2f5sWaQ/JYbFasA90GZ5jiwTLe9p0oGAkv309f3YAmije/v0zrbQi2n77p2eXe1uEL Rbf1jVepRUv9k5u2tIGo5GZNPf11RUOrNOoM9PmEnmPqsTUl3nGbFQbLifuh3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652094803; a=rsa-sha256; cv=none; b=vQbw4ONDhy7hxewZF0R8AZWus6rBauytgtabTr7R7EwpsdWL5M/BTbtRA37J5EO1xY7/TA gwKvQtmSd5W/LRONHKrPIttlhrHSBYenuINTshLNPW93q7M6wCbSRl/3+Qc/1SKLZCo/Iq d1IM2uemrvKPqUTiq49ZCdGdRtc8d3q4e/s1MMcXw/06wDZH55shvebB2msT4vKxAEGgvT JPSBuE+aqtnMaVZd8FHAp0LWSNz8OUH765UxUlYD7AdRSSrxk579DqImnrhQPcav/fhm5r Ij3QztUZZsAP2c8oVH91l75yhDxqXINLdzGsoNqpYD0+mrYS3eWPc0jtun6Ixw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ae49930c7f079112577e62f7f4c0e0f9360a051 commit 1ae49930c7f079112577e62f7f4c0e0f9360a051 Author: Adriaan de Groot AuthorDate: 2022-05-09 10:41:16 +0000 Commit: Adriaan de Groot CommitDate: 2022-05-09 11:13:21 +0000 devel/heaptrack: fix build on 14- On 14-, libunwind doesn't install a corresponding . It doesn't seem to be necessary, either: builds fine on 13- and 14- without the extra check in heaptrack. --- devel/heaptrack/Makefile | 1 + devel/heaptrack/files/patch-cmake_FindLibunwind.cmake | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/devel/heaptrack/Makefile b/devel/heaptrack/Makefile index 1cd10c4d50ea..a2a200db50a1 100644 --- a/devel/heaptrack/Makefile +++ b/devel/heaptrack/Makefile @@ -1,5 +1,6 @@ PORTNAME= heaptrack DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ diff --git a/devel/heaptrack/files/patch-cmake_FindLibunwind.cmake b/devel/heaptrack/files/patch-cmake_FindLibunwind.cmake new file mode 100644 index 000000000000..5141d7b6b37b --- /dev/null +++ b/devel/heaptrack/files/patch-cmake_FindLibunwind.cmake @@ -0,0 +1,18 @@ +--- cmake/FindLibunwind.cmake.orig 2022-05-09 10:37:16 UTC ++++ cmake/FindLibunwind.cmake +@@ -23,9 +23,15 @@ + + + find_path(LIBUNWIND_INCLUDE_DIR libunwind.h ) ++if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ++# FreeBSD 14 doesn't install an header with ++# the libunwind port, and in any case it is not needed. ++message(STATUS "Assuming there is a corresponding unwind.h") ++else() + if(NOT EXISTS "${LIBUNWIND_INCLUDE_DIR}/unwind.h") + MESSAGE("Found libunwind.h but corresponding unwind.h is absent!") + SET(LIBUNWIND_INCLUDE_DIR "") ++endif() + endif() + + find_library(LIBUNWIND_LIBRARY unwind)