diff --git a/dev-util/bear/bear-3.0.17.recipe b/dev-util/bear/bear-3.0.17.recipe index 1b32d6da3..6666b9a6f 100644 --- a/dev-util/bear/bear-3.0.17.recipe +++ b/dev-util/bear/bear-3.0.17.recipe @@ -9,7 +9,7 @@ instead to intercept the invocation of the compiler." HOMEPAGE="https://github.com/rizsotto/Bear" COPYRIGHT="2012-2021 by László Nagy" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/rizsotto/Bear/archive/$portVersion.tar.gz" CHECKSUM_SHA256="107f94e045d930e88f5f5b4b484c8df1bf4834722943525765c271e0b5b34b78" SOURCE_DIR="Bear-$portVersion" diff --git a/dev-util/bear/patches/bear-3.0.17.patchset b/dev-util/bear/patches/bear-3.0.17.patchset index 105e3dcda..cd0e47146 100644 --- a/dev-util/bear/patches/bear-3.0.17.patchset +++ b/dev-util/bear/patches/bear-3.0.17.patchset @@ -31,99 +31,9 @@ index e4fb8c1..8bbd58c 100644 From 82d33658418af633de38d255157b6bc015d70e17 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 18 Oct 2021 15:22:06 +0200 -Subject: link against stdc++fs +Subject: workaround gtest with Haiku error definition -workaround gtest with Haiku error definition -diff --git a/source/bear/CMakeLists.txt b/source/bear/CMakeLists.txt -index 376a003..cbcdc35 100644 ---- a/source/bear/CMakeLists.txt -+++ b/source/bear/CMakeLists.txt -@@ -7,7 +7,8 @@ target_link_libraries(bear - sys_a - flags_a - fmt::fmt -- spdlog::spdlog) -+ spdlog::spdlog -+ stdc++fs) - - include(GNUInstallDirs) - install(TARGETS bear -diff --git a/source/citnames/CMakeLists.txt b/source/citnames/CMakeLists.txt -index dc9d5f3..7de5477 100644 ---- a/source/citnames/CMakeLists.txt -+++ b/source/citnames/CMakeLists.txt -@@ -52,7 +52,8 @@ add_executable(citnames - ) - target_link_libraries(citnames - citnames_a -- citnames_json_a) -+ citnames_json_a -+ stdc++fs) - - include(GNUInstallDirs) - install(TARGETS citnames -@@ -82,6 +83,7 @@ if (ENABLE_UNIT_TESTS) - target_link_libraries(citnames_unit_test citnames_a) - target_link_libraries(citnames_unit_test citnames_json_a) - target_link_libraries(citnames_unit_test PkgConfig::GTest ${CMAKE_THREAD_LIBS_INIT}) -+ target_link_libraries(citnames_unit_test stdc++fs) - - add_test(NAME bear::citnames_unit_test COMMAND $) - endif () -diff --git a/source/intercept/CMakeLists.txt b/source/intercept/CMakeLists.txt -index e9598c0..62b741d 100644 ---- a/source/intercept/CMakeLists.txt -+++ b/source/intercept/CMakeLists.txt -@@ -59,7 +59,8 @@ add_executable(intercept - source/collect/main.cc) - target_link_libraries(intercept - main_a -- intercept_a) -+ intercept_a -+ stdc++fs) - - install(TARGETS intercept - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -@@ -103,7 +104,8 @@ add_executable(wrapper - target_include_directories(wrapper PUBLIC source/) - target_link_libraries(wrapper - main_a -- wrapper_a) -+ wrapper_a -+ stdc++fs) - - install(TARGETS wrapper - RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/bear) -@@ -202,6 +204,8 @@ if (ENABLE_UNIT_TESTS) - target_include_directories(exec_unit_test PRIVATE test) - target_link_libraries(exec_unit_test exec_a) - target_link_libraries(exec_unit_test PkgConfig::GTest ${CMAKE_THREAD_LIBS_INIT}) -+ target_link_libraries(exec_unit_test stdc++fs) -+ - - add_test(NAME bear::exec_unit_test COMMAND $) - -@@ -212,6 +216,7 @@ if (ENABLE_UNIT_TESTS) - target_link_libraries(intercept_unit_test intercept_a) - target_link_libraries(intercept_unit_test wrapper_a) - target_link_libraries(intercept_unit_test PkgConfig::GTest ${CMAKE_THREAD_LIBS_INIT}) -+ target_link_libraries(intercept_unit_test stdc++fs) - - add_test(NAME bear::intercept_unit_test COMMAND $) - endif () -diff --git a/source/libsys/CMakeLists.txt b/source/libsys/CMakeLists.txt -index ca2638f..81832bf 100644 ---- a/source/libsys/CMakeLists.txt -+++ b/source/libsys/CMakeLists.txt -@@ -28,6 +28,7 @@ if (ENABLE_UNIT_TESTS) - target_include_directories(sys_unit_test PRIVATE source/) - target_link_libraries(sys_unit_test sys_a) - target_link_libraries(sys_unit_test PkgConfig::GTest ${CMAKE_THREAD_LIBS_INIT}) -+ target_link_libraries(sys_unit_test stdc++fs) - - add_test(NAME bear::sys_unit_test COMMAND $) - endif () diff --git a/source/libsys/test/ErrorsTest.cc b/source/libsys/test/ErrorsTest.cc index 0ead223..9360cef 100644 --- a/source/libsys/test/ErrorsTest.cc @@ -138,13 +48,6 @@ index 0ead223..9360cef 100644 namespace { TEST(errors, ENOENT) -@@ -31,4 +34,4 @@ namespace { - - EXPECT_STREQ("No such file or directory", result.data()); - } --} -\ No newline at end of file -+} -- 2.30.2