From nobody Wed Aug 17 18:59:55 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 4M7HQ341RTz4Yyxn; Wed, 17 Aug 2022 18:59:55 +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 4M7HQ33T94z4JHD; Wed, 17 Aug 2022 18:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660762795; 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=4Cz0DUnHcmN0akQJ85vix5y0Len/Y9rBF3zCMzc0OyE=; b=y0AU2q8ymRxd8kptq/RaIkp54t8cZhbbG8DjGANYZU0EBuDNiOcFqz2sC4J92py6C2w2oN P7KgoJQdc6SeLjtUtleN3wTmGRrvc4mQR+SPaCQZPhEBsJN+h2MORbcUTpTesZIDOZWybD /5ZEw+/2xhniCMaQGQpZLDReqt8J7jm8vTj6zD/Jr/JtOJanBd18Ez/wJ6WFqWA5mVGSMm 4IFQgngL4f+SCSM3Fx0Z3sISNTEtHeWvtUpg6pr0FpWToVzNPOhP3Nk9HykEAnnOsEwMt5 +3ykvMDK8CaNndTEhaG700R/1zGiR/L8iugllK8eaCwWT64dwmn1hpbL2yRXOQ== 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 4M7HQ32QcMz11MS; Wed, 17 Aug 2022 18:59:55 +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 27HIxtqs014402; Wed, 17 Aug 2022 18:59:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27HIxthx014401; Wed, 17 Aug 2022 18:59:55 GMT (envelope-from git) Date: Wed, 17 Aug 2022 18:59:55 GMT Message-Id: <202208171859.27HIxthx014401@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: c367c66fab6e - main - devel/gammaray: unbreak packaging in i386 arch (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c367c66fab6e3d63b2026e6bddec41121e2f607c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660762795; 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=4Cz0DUnHcmN0akQJ85vix5y0Len/Y9rBF3zCMzc0OyE=; b=fbAiTVymNMBewska9yb3A/TwvlJFLvTSktJr+1UmY90qCUibT1Ne+p8I5EiOxAB7F50RMQ FM/Z0jQ+fsNikKJ0RxLbiYGceM1GgR13BocSBCzpR3Rph8tuWR5jMpk7t4U1f8GaIXi4OG V9G4exOuXJGncYYhvELtsSdfyGz4DnUW0KlPwbTXPi5rZfdD4pMKE8C2OsVynVYdbClO39 a+/t6cwClcKXe0Qa5PZtU0Pf5VL+rOB129HfPQmgFlGGnj1HIbLQXj/HhUw6dzH71oxhDS zTiuZSV0M0b1PzXv9YCWQKZeU2MuzV0HWwH15hRpR6hN47s5M6VZr3UkIbpbAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660762795; a=rsa-sha256; cv=none; b=TbElqS/jGCQ5a/2G2Ihq6j/SeTsM7S2FG6UbzAVv6hMT70R/uWCj7KLQutuvUroJc4jQdk HafHG9S7FP8knsxNX8TE0u6NgDqJ0r61jKkJv2HSZBoGemJf8+tMY6w0/53XBjIV+gMqKk Nn7/9R+diWBh6+f+3cmwl0wiK1mPprWnGR04JHFjkcJPuGnLbKuWeMUtVBUF4dbuvo4vi5 MZEtdrW+J11UY3thIghGscEkWOSMahv7R0twd/NbLF+alPhZVG5alqgm0en5/xafXXKlBX q+pB3zpWC6bnHecsfr+CgSNsS9ydlP0wdwoVh1UMaRQ2WmukbuN8F3fvIrgRdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c367c66fab6e3d63b2026e6bddec41121e2f607c commit c367c66fab6e3d63b2026e6bddec41121e2f607c Author: Dima Panov AuthorDate: 2022-08-17 18:55:31 +0000 Commit: Dima Panov CommitDate: 2022-08-17 18:58:42 +0000 devel/gammaray: unbreak packaging in i386 arch (+) Gammaray-probe already define i686 for 32bit x86 build While here, point probe to use libdwarf/libelf directly instead of rely on autodetect in configure stage. --- devel/gammaray/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/devel/gammaray/Makefile b/devel/gammaray/Makefile index b07241fe29ff..40742a35fba0 100644 --- a/devel/gammaray/Makefile +++ b/devel/gammaray/Makefile @@ -1,6 +1,6 @@ PORTNAME= gammaray PORTVERSION= 2.11.3 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -12,6 +12,9 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE.GPL.txt LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE.BSD2.txt +LIB_DEPENDS= libdwarf.so:devel/libdwarf \ + libelf.so:devel/libelf + USES= cmake kde:5 pkgconfig qt:5 USE_QT= 3d concurrent core declarative designer gui help linguisttools \ @@ -23,6 +26,10 @@ USE_GITHUB= yes GH_ACCOUNT= KDAB GH_PROJECT= GammaRay + +CMAKE_OFF= STACK_DETAILS_AUTO_DETECT +CMAKE_ON= STACK_DETAILS_DWARF + .include .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 @@ -32,7 +39,7 @@ USE_QT+= webengine PLIST_SUB= WEBENGINE="@comment " .endif -PLIST_SUB+= ARCH=${ARCH:S/amd64/x86_64/:C/armv./arm/} \ +PLIST_SUB+= ARCH=${ARCH:S/amd64/x86_64/:S/i386/i686/:C/armv./arm/} \ PORTMAJMIN=${PORTVERSION:C/(.*)\..*/\1/} \ PORTVERSION=${PORTVERSION} \ QTVER=${QT5_VERSION:C/\./_/:C/\..*//}