Merge pull request #1189

Build for solaris 11.4-11.4.42.0.0.111.0
bareos · Jun 21, 2022 · 8c02ea1 · 8c02ea1
2 parents 734ec60 + 85476e5
commit 8c02ea1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -86,6 +86,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 - dird: console: changed list jobs jobstatus argument to accept comma separated value [PR #1169]
 - cats: management scripts remove db_driver support [PR #1081]
 - bconsole: multiple identical successive commands are only added to history once [PR #1162]
+- build: Now use solaris 11.4-11.4.42.0.0.111.0 [PR #1189]
 
 ### Deprecated
 - make_catalog_backup.pl is now a shell wrapper script which will be removed in version 23.

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
@@ -26,7 +26,9 @@ include(GNUInstallDirs)
 include(BareosSetVariableDefaults)
 
 add_subdirectory(fd-plugins)
-add_subdirectory(misc)
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  add_subdirectory(misc)
+endif()
 if(NOT client-only)
   add_subdirectory(dir-plugins)
 endif()