Handle both, static and dynamic linking

teqwve · teqwve · commit b60d9b56f8fa · 2018-11-14T20:45:46.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,17 +2,30 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 
 INCLUDE(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
 INCLUDE(${CMAKE_ROOT}/Modules/GNUInstallDirs.cmake)
+
+IF(NOT DEFINED LINK)
+    SET(LINK "STATIC")
+ENDIF()
+IF(NOT LINK MATCHES "STATIC|DYNAMIC")
+    MESSAGE(FATAL_ERROR "LINK should be one of STATIC, DYNAMIC")
+ENDIF()
+
 INCLUDE(external/libseccomp.cmake)
 INCLUDE(external/libcap.cmake)
 INCLUDE(external/libtclap.cmake)
 
-SET(CMAKE_C_FLAGS "-std=gnu99 -Wall -static")
+SET(CMAKE_C_FLAGS "-std=gnu99 -Wall")
 SET(CMAKE_C_FLAGS_DEBUG "-g -pedantic")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
-SET(CMAKE_CXX_FLAGS "-std=gnu++14 -Wall -static")
+SET(CMAKE_CXX_FLAGS "-std=gnu++14 -Wall")
 SET(CMAKE_CXX_FLAGS_DEBUG "-g -pedantic")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O3")
 
+IF(LINK STREQUAL "STATIC")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static")
+ENDIF()
+
 EXECUTE_PROCESS(COMMAND uname -r
     OUTPUT_VARIABLE BUILD_KERNEL_RELEASE)
 ADD_DEFINITIONS('-DBUILD_KERNEL_RELEASE="${BUILD_KERNEL_RELEASE}"')
diff --git a/README.md b/README.md
@@ -46,6 +46,11 @@ and wheather to install boxes scripts (NO by default):
 
     -DWITH_BOXES=YES|NO
 
+To control wheather sio2jail binary is statically or dinamically linked use
+option (STATIC by default):
+
+    -DLINK=STATIC|DYNAMIC
+
 For example, to skip man pages, use libtclap from /opt/tclap directory and
 ignore system libseccomp run:
 
diff --git a/external/libseccomp.cmake b/external/libseccomp.cmake
@@ -5,9 +5,14 @@ ENDIF()
 ADD_LIBRARY(seccomp STATIC IMPORTED)
 
 IF(NOT DEFINED LIBSECCOMP_BUILD_OWN OR LIBSECCOMP_BUILD_OWN STREQUAL "NO")
+    IF(LINK STREQUAL "STATIC")
+        SET(libseccomp_LIB_FILE_NAME "libseccomp.a")
+    ELSE()
+        SET(libseccomp_LIB_FILE_NAME "libseccomp.so")
+    ENDIF()
     FIND_FILE(
         libseccomp_LIB_PATH
-        NAMES libseccomp.a
+        NAMES "${libseccomp_LIB_FILE_NAME}"
         PATHS "${LIBSECCOMP_PREFIX}" "${LIBSECCOMP_PREFIX}/lib" "${LIBSECCOMP_PREFIX}/usr/lib"
         )
     FIND_PATH(
@@ -52,7 +57,11 @@ IF((NOT DEFINED LIBSECCOMP_BUILD_OWN AND (NOT EXISTS "${libseccomp_LIB_PATH}" OR
 
     ExternalProject_Get_Property(seccomp_project
         INSTALL_DIR)
-    SET(libseccomp_LIB_PATH "${INSTALL_DIR}/lib/libseccomp.a")
+    IF(LINK STREQUAL "STATIC")
+        SET(libseccomp_LIB_PATH "${INSTALL_DIR}/lib/libseccomp.a")
+    ELSE()
+        SET(libseccomp_LIB_PATH "${INSTALL_DIR}/lib/libseccomp.so")
+    ENDIF()
     SET(libseccomp_INC_PATH "${INSTALL_DIR}/include")
 
     ADD_DEPENDENCIES(seccomp seccomp_project)
