[review request] science/pulseview: unbreak the build

Andriy Gapon avg at FreeBSD.org
Thu Feb 20 17:05:58 GMT 2025


Could you please review and/or commit the below?


commit ef61c084372eb105f0d9ce6d7dbb32c098055f53
Author:     Andriy Gapon <avg at FreeBSD.org>
AuthorDate: Mon Feb 17 11:27:40 2025 +0200
Commit:     Andriy Gapon <avg at FreeBSD.org>
CommitDate: Mon Feb 17 11:27:40 2025 +0200

     science/pulseview: unbreak the build

     The root cause of build failures was forcing -std=c++11 option on the
     compiler while boost really requires at least C++14.
     Boost was recently upgarded to version 1.87, see a4245a4c6ce19c6.

     This change reverts 338914f96f7 and adds a patch to suppress -std=c++11.

diff --git a/science/pulseview/Makefile b/science/pulseview/Makefile
index 0a5faea8cf53..ba9d698a4050 100644
--- a/science/pulseview/Makefile
+++ b/science/pulseview/Makefile
@@ -15,8 +15,6 @@ WWW=		https://sigrok.org/
  LICENSE=	GPLv3
  LICENSE_FILE=	${WRKSRC}/COPYING

-BROKEN=		fails to build with Boost>=1.87
-
  LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
  		libsigrok.so:devel/libsigrok \
  		libsigrokdecode.so:devel/libsigrokdecode
diff --git a/science/pulseview/files/patch-CMakeLists.txt 
b/science/pulseview/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..f50f947bfa56
--- /dev/null
+++ b/science/pulseview/files/patch-CMakeLists.txt
@@ -0,0 +1,18 @@
+--- CMakeLists.txt.orig	2020-03-31 23:41:18.000000000 +0300
++++ CMakeLists.txt	2025-02-17 08:49:34.073618000 +0200
+@@ -146,7 +146,6 @@
+   include(CheckCXXSourceCompiles)
+   include(CMakePushCheckState)
+   cmake_push_check_state()
+-  set(CMAKE_REQUIRED_FLAGS "-std=c++11")
+   set(CMAKE_REQUIRED_LIBRARIES "${additional_lib}")
+   set(CMAKE_REQUIRED_QUIET 1)
+   CHECK_CXX_SOURCE_COMPILES("
+@@ -445,7 +444,6 @@
+ add_definitions(-DQT_NO_KEYWORDS)
+ add_definitions(-D__STDC_LIMIT_MACROS)
+ add_definitions(-Wall -Wextra)
+-add_definitions(-std=c++11)
+ add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
+
+ if(ENABLE_FLOW)

-- 
Andriy Gapon



More information about the kde-freebsd mailing list