git: 9ada3310f782 - main - science/pulseview: unbreak the build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 21 Feb 2025 06:07:20 UTC
The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ada3310f782f37d84a665188d760c0a2c46a931 commit 9ada3310f782f37d84a665188d760c0a2c46a931 Author: Andriy Gapon <avg@FreeBSD.org> AuthorDate: 2025-02-17 09:27:40 +0000 Commit: Andriy Gapon <avg@FreeBSD.org> CommitDate: 2025-02-21 06:06:49 +0000 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. --- science/pulseview/Makefile | 2 -- science/pulseview/files/patch-CMakeLists.txt | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) 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)