Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: https://icinga.com/blog/2023/07/12/releasing-icinga-2-14-and-2-13-8/ Sponsored by: Netzkommune GmbH
- Loading branch information
Showing
6 changed files
with
30 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
TIMESTAMP = 1685558338 | ||
SHA256 (icinga-icinga2-v2.13.7_GH0.tar.gz) = 8a37b7731b30127c01de8ac4cd2372b2b3a06a3972d896fd206454f6e5b136b4 | ||
SIZE (icinga-icinga2-v2.13.7_GH0.tar.gz) = 9667526 | ||
SHA256 (dd51997c73c6b4b328e3ad006eb8c86678001780.patch) = 95a729bda8c368e15c89ceb98d45cfcd8048d28cb8659eeb79adc07724a4dcf5 | ||
SIZE (dd51997c73c6b4b328e3ad006eb8c86678001780.patch) = 3876 | ||
TIMESTAMP = 1691660351 | ||
SHA256 (icinga-icinga2-v2.14.0_GH0.tar.gz) = e97ff8560148fd9dc1c57e3901840a0f8515b9ce53922dbaec7799c220d9f44f | ||
SIZE (icinga-icinga2-v2.14.0_GH0.tar.gz) = 9389972 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,26 @@ | ||
--- CMakeLists.txt.orig 2020-08-03 13:43:47 UTC | ||
+++ CMakeLists.txt | ||
@@ -13,8 +13,8 @@ if(NOT CMAKE_BUILD_TYPE) | ||
FORCE) | ||
--- CMakeLists.txt.orig 2023-08-11 08:54:43.660987000 +0200 | ||
+++ CMakeLists.txt 2023-08-11 09:20:13.573939000 +0200 | ||
@@ -29,8 +29,8 @@ endif() | ||
set(ICINGA2_MASTER ON) | ||
endif() | ||
|
||
-option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ON) | ||
-option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ON) | ||
+option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" OFF) | ||
+option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" OFF) | ||
-option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ${ICINGA2_MASTER}) | ||
-option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ${ICINGA2_MASTER}) | ||
+option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ON) | ||
+option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ON) | ||
option(ICINGA2_WITH_CHECKER "Build the checker module" ON) | ||
option(ICINGA2_WITH_COMPAT "Build the compat module" ON) | ||
option(ICINGA2_WITH_LIVESTATUS "Build the Livestatus module" ON) | ||
@@ -260,6 +260,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") | ||
option(ICINGA2_WITH_COMPAT "Build the compat module" ${ICINGA2_MASTER}) | ||
option(ICINGA2_WITH_LIVESTATUS "Build the Livestatus module" ${ICINGA2_MASTER}) | ||
@@ -269,6 +269,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") | ||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -pthread") | ||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -pthread") | ||
endif() | ||
+endif() | ||
+ | ||
+if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD.*") | ||
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lexecinfo") | ||
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lexecinfo") | ||
+ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lexecinfo") | ||
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lexecinfo") | ||
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lexecinfo") | ||
+ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lexecinfo") | ||
endif() | ||
|
||
include(CheckCXXCompilerFlag) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters