svn commit: r569071 - in head/devel/gammaray: . files

[Steve Wills]

Author: swills
Date: Tue Mar 23 23:23:50 2021
New Revision: 569071
URL: https://svnweb.freebsd.org/changeset/ports/569071

Log:
  devel/gammaray: fix amd64 ABI detection, build
  
  PR:		254477
  Submitted by:	Greg V <greg at unrelenting.technology>
  --This line, and those below, will be ignored--
  > Description of fields to fill in above:                     76 columns --|
  > PR:                       If and which Problem Report is related.
  > Submitted by:             If someone else sent in the change.
  > Reported by:              If someone else reported the issue.
  > Reviewed by:              If someone else reviewed your modification.
  > Approved by:              If you needed approval for this commit.
  > Obtained from:            If the change is from a third party.
  > MFC after:                N [day[s]|week[s]|month[s]].  Request a reminder email.
  > MFH:                      Ports tree branch name.  Request approval for merge.
  > Relnotes:                 Set to 'yes' for mention in release notes.
  > Security:                 Vulnerability reference (one per line) or description.
  > Sponsored by:             If the change was sponsored by an organization.
  > Differential Revision:    https://reviews.freebsd.org/D### (*full* phabric URL needed).
  > Empty fields above will be automatically removed.

Added:
  head/devel/gammaray/files/
  head/devel/gammaray/files/patch-3rdparty_backward-cpp_BackwardMacros.cmake   (contents, props changed)
  head/devel/gammaray/files/patch-CMakeLists.txt   (contents, props changed)
  head/devel/gammaray/files/patch-cmake_GammaRayProbeABI.cmake   (contents, props changed)
Modified:
  head/devel/gammaray/Makefile   (contents, props changed)

Modified: head/devel/gammaray/Makefile
==============================================================================
--- head/devel/gammaray/Makefile	Tue Mar 23 22:27:16 2021	(r569070)
+++ head/devel/gammaray/Makefile	Tue Mar 23 23:23:50 2021	(r569071)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gammaray
 PORTVERSION=	2.11.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -20,7 +21,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	KDAB
 GH_PROJECT=	GammaRay
 
-PLIST_SUB+=	ARCH=${ARCH} \
+PLIST_SUB+=	ARCH=${ARCH:S/amd64/x86_64/} \
 		PORTMAJMIN=${PORTVERSION:C/(.*)\..*/\1/} \
 		PORTVERSION=${PORTVERSION} \
 		QTVER=${QT5_VERSION:C/\./_/:C/\..*//}

Added: head/devel/gammaray/files/patch-3rdparty_backward-cpp_BackwardMacros.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gammaray/files/patch-3rdparty_backward-cpp_BackwardMacros.cmake	Tue Mar 23 23:23:50 2021	(r569071)
@@ -0,0 +1,14 @@
+This seems to be a mistake, the comment says "static" but check is for dynamic!
+Results in libiberty not being found
+
+--- 3rdparty/backward-cpp/BackwardMacros.cmake.orig	2021-03-22 12:20:48 UTC
++++ 3rdparty/backward-cpp/BackwardMacros.cmake
+@@ -79,7 +79,7 @@ if (${STACK_DETAILS_AUTO_DETECT})
+ 
+ 		# If we attempt to link against static bfd, make sure to link its dependencies, too
+ 		get_filename_component(bfd_lib_ext "${LIBBFD_LIBRARIES}" EXT)
+-		if (bfd_lib_ext STREQUAL ".so")
++		if (bfd_lib_ext STREQUAL ".a")
+ 			list(APPEND BACKWARD_LIBRARIES iberty z)
+ 		endif()
+ 

Added: head/devel/gammaray/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gammaray/files/patch-CMakeLists.txt	Tue Mar 23 23:23:50 2021	(r569071)
@@ -0,0 +1,12 @@
+Weird CMake macro error coming from that
+
+--- CMakeLists.txt.orig	2021-03-22 12:21:36 UTC
++++ CMakeLists.txt
+@@ -405,7 +405,6 @@ find_package(Qt5 NO_MODULE QUIET OPTIONAL_COMPONENTS
+   Test
+   WebEngineWidgets
+   Widgets
+-  WaylandCompositor
+ )
+ 
+ set(MACOS_DISABLE_UNSUPPORTED_TESTS FALSE)

Added: head/devel/gammaray/files/patch-cmake_GammaRayProbeABI.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gammaray/files/patch-cmake_GammaRayProbeABI.cmake	Tue Mar 23 23:23:50 2021	(r569071)
@@ -0,0 +1,11 @@
+--- cmake/GammaRayProbeABI.cmake.orig	2021-03-22 12:26:15 UTC
++++ cmake/GammaRayProbeABI.cmake
+@@ -110,7 +110,7 @@ else()
+       set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-arm")
+     endif()
+   else()
+-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3456]86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "corei")
++    if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3456]86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "corei")
+       if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+         set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-x86_64")
+       else()