build: optionally static link boost

LizardByte · Jun 1, 2024 · 5e7cbf8 · 5e7cbf8
1 parent 9afb1ae
commit 5e7cbf8
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 7 deletions.
diff --git a/cmake/compile_definitions/common.cmake b/cmake/compile_definitions/common.cmake
@@ -129,6 +129,10 @@ include_directories(
         ${PLATFORM_INCLUDE_DIRS}
 )
 
+if(BOOST_USE_DYNAMIC)
+    list(APPEND PLATFORM_LIBRARIES Boost::dynamic_linking)
+endif()
+
 list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
         ${MINIUPNP_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}

diff --git a/cmake/compile_definitions/linux.cmake b/cmake/compile_definitions/linux.cmake
@@ -246,7 +246,6 @@ list(APPEND PLATFORM_TARGET_FILES
         "${CMAKE_SOURCE_DIR}/third-party/glad/include/glad/egl.h")
 
 list(APPEND PLATFORM_LIBRARIES
-        Boost::dynamic_linking
         dl
         pulse
         pulse-simple)

diff --git a/cmake/dependencies/Boost_Sunshine.cmake b/cmake/dependencies/Boost_Sunshine.cmake
@@ -0,0 +1,32 @@
+#
+# Loads the boost library giving the priority to the system package first, with a fallback to FetchContent.
+#
+include_guard(GLOBAL)
+
+set(BOOST_VERSION 1.85)
+set(BOOST_COMPONENTS
+        locale
+        log
+        filesystem
+        program_options)
+
+find_package(Boost ${BOOST_VERSION} COMPONENTS ${BOOST_COMPONENTS})
+if(NOT Boost_FOUND)
+    message(STATUS "Boost v${BOOST_VERSION}.x package not found in the system. Falling back to FetchContent.")
+    include(FetchContent)
+
+    # Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+        cmake_policy(SET CMP0135 NEW)
+    endif()
+
+    # Limit boost to the required libraries only
+    set(BOOST_INCLUDE_LIBRARIES
+            ${BOOST_COMPONENTS})
+    FetchContent_Declare(
+            Boost
+            URL https://github.com/boostorg/boost/releases/download/boost-1.85.0/boost-1.85.0-cmake.tar.xz
+            URL_HASH MD5=BADEA970931766604D4D5F8F4090B176
+    )
+    FetchContent_MakeAvailable(Boost)
+endif()
diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake
@@ -15,6 +15,16 @@ find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
 pkg_check_modules(CURL REQUIRED libcurl)
 
+if(NOT BOOST_USE_DYNAMIC)
+    set(Boost_USE_STATIC_LIBS ON)  # cmake-lint: disable=C0103
+
+    # workaround to prevent link errors against icudata, icui18n
+    # TODO: only needed for Boost <= 1.74 ?
+    set(Boost_NO_BOOST_CMAKE ON) # cmake-lint: disable=C0103
+endif()
+# find_package(Boost 1.74.0 COMPONENTS locale log filesystem program_options REQUIRED)
+include(dependencies/Boost_Sunshine)
+
 # miniupnp
 pkg_check_modules(MINIUPNP miniupnpc REQUIRED)
 include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS})

diff --git a/cmake/dependencies/unix.cmake b/cmake/dependencies/unix.cmake
@@ -1,4 +1,2 @@
 # unix specific dependencies
 # put anything here that applies to both linux and macos
-
-find_package(Boost COMPONENTS locale log filesystem program_options REQUIRED)
diff --git a/cmake/dependencies/windows.cmake b/cmake/dependencies/windows.cmake
@@ -1,7 +1,5 @@
 # windows specific dependencies
 
-set(Boost_USE_STATIC_LIBS ON)  # cmake-lint: disable=C0103
-find_package(Boost 1.71.0 COMPONENTS locale log filesystem program_options REQUIRED)
-
 # nlohmann_json
+# TODO: should we use boost json instead?
 pkg_check_modules(NLOHMANN_JSON nlohmann_json REQUIRED IMPORTED_TARGET)
diff --git a/cmake/prep/options.cmake b/cmake/prep/options.cmake
@@ -15,6 +15,8 @@ option(SUNSHINE_REQUIRE_TRAY "Require system tray icon. Fail the build if tray r
 
 option(SUNSHINE_SYSTEM_WAYLAND_PROTOCOLS "Use system installation of wayland-protocols rather than the submodule." OFF)
 
+option(BOOST_USE_DYNAMIC "Use dynamic boost libraries." OFF)
+
 option(CUDA_INHERIT_COMPILE_OPTIONS
         "When building CUDA code, inherit compile options from the the main project. You may want to disable this if
         your IDE throws errors about unknown flags after running cmake." ON)

diff --git a/docker/fedora-39.dockerfile b/docker/fedora-39.dockerfile
@@ -31,6 +31,7 @@ dnf -y update
 dnf -y group install "Development Tools"
 dnf -y install \
   boost-devel-1.81.0* \
+  boost-static-1.81.0* \
   cmake-3.27.* \
   doxygen \
   gcc-13.2.* \

diff --git a/docker/fedora-40.dockerfile b/docker/fedora-40.dockerfile
@@ -31,6 +31,7 @@ dnf -y update
 dnf -y group install "Development Tools"
 dnf -y install \
   boost-devel-1.83.0* \
+  boost-static-1.83.0* \
   cmake-3.28.* \
   doxygen \
   gcc-14.1.* \

diff --git a/docs/source/building/linux.rst b/docs/source/building/linux.rst
@@ -56,6 +56,7 @@ Install Requirements
       sudo dnf group install "Development Tools" && \
       sudo dnf install \
           boost-devel \
+          boost-static \
           cmake \
           gcc \
           gcc-c++ \

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -42,7 +42,7 @@ modules:
     build-commands:
       - cd tools/build && bison -y -d -o src/engine/jamgram.cpp src/engine/jamgram.y
       - ./bootstrap.sh --prefix=$FLATPAK_DEST --with-libraries=locale,log,program_options,system,thread
-      - ./b2 install variant=release link=shared runtime-link=shared cxxflags="$CXXFLAGS" linkflags="$LDFLAGS"
+      - ./b2 install variant=release link=static,shared runtime-link=shared cxxflags="$CXXFLAGS" linkflags="$LDFLAGS"
         -j $FLATPAK_BUILDER_N_JOBS
     sources:
       - type: archive