git: c367c66fab6e - main - devel/gammaray: unbreak packaging in i386 arch (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 17 Aug 2022 18:59:55 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c367c66fab6e3d63b2026e6bddec41121e2f607c
commit c367c66fab6e3d63b2026e6bddec41121e2f607c
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-08-17 18:55:31 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
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 <bsd.port.options.mk>
.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/\..*//}