fix dynamic linking of sod

Author: matteius

CMakeLists.txt

@@ -98,39 +98,19 @@ endif()
 
 # Set up SOD library if enabled
 if(ENABLE_SOD)
-    # Only add the SOD subdirectory if we're doing static linking
-    if(NOT SOD_DYNAMIC_LINK)
-        add_subdirectory(src/sod)
-    endif()
+    # Add the SOD subdirectory regardless of linking method
+    # The CMakeLists.txt in the SOD directory will handle
+    # building as static or shared based on SOD_DYNAMIC_LINK
+    add_subdirectory(src/sod)
 
     # Add the SOD_ENABLED define regardless of linking method
     add_definitions(-DSOD_ENABLED)
 
     # Always set the include directory
     set(SOD_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/sod")
 
-    # For dynamic linking, we need to find the SOD library in the system
+    # If dynamic linking is enabled, add the define
     if(SOD_DYNAMIC_LINK)
-        # First try pkg-config
-        pkg_check_modules(SOD sod)
-
-        # If not found via pkg-config, try find_library
-        if(NOT SOD_FOUND)
-            find_library(SOD_LIBRARY NAMES sod)
-            if(SOD_LIBRARY)
-                set(SOD_LIBRARIES ${SOD_LIBRARY})
-                set(SOD_FOUND TRUE)
-                message(STATUS "Found SOD library: ${SOD_LIBRARY}")
-            endif()
-        endif()
-
-        # If still not found, warn but continue as the code will fall back to dynamic loading
-        if(NOT SOD_FOUND)
-            message(WARNING "SOD library not found for dynamic linking. "
-                    "The application will attempt to load it at runtime.")
-        endif()
-
-        # Add a define to indicate dynamic linking should be used
         add_definitions(-DSOD_DYNAMIC_LINK)
     endif()
 endif()
@@ -250,6 +230,11 @@ endif()
 # Define the executable
 add_executable(lightnvr ${SOURCES})
 
+# Set the output directory for the binary
+set_target_properties(lightnvr PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+)
+
 # Link libraries
 target_link_libraries(lightnvr
         ${FFMPEG_LIBRARIES}
@@ -268,17 +253,42 @@ endif()
 
 # Link SOD library if enabled
 if(ENABLE_SOD)
-    if(SOD_DYNAMIC_LINK AND SOD_FOUND)
-        # For dynamic linking, link against the found SOD library
-        target_link_libraries(lightnvr ${SOD_LIBRARIES})
-        message(STATUS "Using dynamic linking for SOD library")
-    elseif(NOT SOD_DYNAMIC_LINK)
-        # For static linking, link against our built SOD library
-        target_link_libraries(lightnvr sod)
-        message(STATUS "Using static linking for SOD library")
+    # Always link to the sod target, whether it's built as static or shared
+    target_link_libraries(lightnvr sod)
+
+    # Log the linking method for clarity
+    if(SOD_DYNAMIC_LINK)
+        message(STATUS "Using dynamic linking for SOD library (built from source)")
+
+        # Set proper RPATH settings for the main executable when using dynamic SOD
+        set_target_properties(lightnvr PROPERTIES
+                BUILD_WITH_INSTALL_RPATH TRUE
+                INSTALL_RPATH "$ORIGIN/../src/sod:$ORIGIN/../lib"
+        )
+
+        # Make sure the shared library gets installed to lib directory
+        install(TARGETS sod
+                LIBRARY DESTINATION lib
+                RUNTIME DESTINATION bin
+        )
+
+        # Copy the SOD shared library to a directory next to the executable
+        add_custom_command(TARGET lightnvr POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/lib"
+                COMMAND ${CMAKE_COMMAND} -E copy
+                "$<TARGET_FILE:sod>"
+                "${CMAKE_BINARY_DIR}/lib/"
+                COMMENT "Copying SOD shared library to lib directory"
+        )
+
+        # Additional direct RPATH via linker flags for older systems
+        if(UNIX AND NOT APPLE)
+            set_target_properties(lightnvr PROPERTIES
+                    LINK_FLAGS "-Wl,-rpath,\$ORIGIN/../src/sod:\$ORIGIN/../lib"
+            )
+        endif()
     else()
-        # SOD will be loaded at runtime
-        message(STATUS "SOD will be loaded at runtime via dlopen()")
+        message(STATUS "Using static linking for SOD library")
     endif()
 endif()
 
@@ -293,9 +303,6 @@ if(BUILD_TESTS)
     add_subdirectory(tests)
 endif()
 
-# Output binary to a 'bin' directory
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
 # Create a version.h file
 configure_file(
         ${CMAKE_CURRENT_SOURCE_DIR}/include/core/version.h.in
@@ -317,4 +324,4 @@ message(STATUS "- Include directories:")
 foreach(dir ${LIGHTNVR_INCLUDE_DIRS})
     message(STATUS "  * ${dir}")
 endforeach()
-message(STATUS "Ensure all dependencies are optimized for low memory usage")
+message(STATUS "Ensure all dependencies are optimized for low memory usage")

scripts/build.sh

@@ -59,7 +59,7 @@ while [[ $# -gt 0 ]]; do
             echo "  --clean            Clean build directory before building"
             echo "  --with-sod         Build with SOD support (default)"
             echo "  --without-sod      Build without SOD support"
-            echo "  --sod-dynamic      Use dynamic linking for SOD"
+            echo "  --sod-dynamic      Use dynamic linking for SOD (builds libsod.so)"
             echo "  --sod-static       Use static linking for SOD (default)"
             echo "  --with-tests       Build test suite (default)"
             echo "  --without-tests    Build without test suite"
@@ -74,6 +74,10 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
+
+# Add this to your build script before building
+export LD_LIBRARY_PATH="$PWD/build/Release/src/sod:$LD_LIBRARY_PATH"
+
 # Set build directory
 BUILD_DIR="build/$BUILD_TYPE"
 
@@ -100,10 +104,10 @@ SOD_OPTION=""
 if [ "$ENABLE_SOD" -eq 1 ]; then
     if [ "$SOD_DYNAMIC" -eq 1 ]; then
         SOD_OPTION="-DENABLE_SOD=ON -DSOD_DYNAMIC_LINK=ON"
-        echo "Building with SOD support (dynamic linking)"
+        echo "Building with SOD support as a shared library (dynamic linking)"
     else
         SOD_OPTION="-DENABLE_SOD=ON -DSOD_DYNAMIC_LINK=OFF"
-        echo "Building with SOD support (static linking)"
+        echo "Building with SOD support as a static library (static linking)"
     fi
 else
     SOD_OPTION="-DENABLE_SOD=OFF"
@@ -217,6 +221,31 @@ cmake --build "$BUILD_DIR" -- -j$(nproc)
 echo "Build completed successfully!"
 echo "Binary location: $BUILD_DIR/bin/lightnvr"
 
+# Check if the binary is linked to libsod.so when dynamic linking is enabled
+if [ "$ENABLE_SOD" -eq 1 ] && [ "$SOD_DYNAMIC" -eq 1 ]; then
+    echo "Checking if lightnvr is linked to libsod.so..."
+    if ldd "$BUILD_DIR/bin/lightnvr" | grep -q "libsod.so"; then
+        echo "SUCCESS: lightnvr is correctly linked to libsod.so"
+    else
+        echo "WARNING: lightnvr is not linked to libsod.so"
+        echo "This might indicate a problem with the dynamic linking setup."
+
+        # Check if libsod.so exists in the build output
+        echo "Checking for libsod.so in the build directory..."
+        if find "$BUILD_DIR" -name "libsod.so" | grep -q .; then
+            echo "Found libsod.so in the build directory. It might not be in the library path."
+            LIBSOD_PATH=$(find "$BUILD_DIR" -name "libsod.so" | head -1)
+
+            # Try to load the library directly
+            echo "You can run the application with:"
+            echo "LD_LIBRARY_PATH=\"$(dirname \"$LIBSOD_PATH\"):$LD_LIBRARY_PATH\" $BUILD_DIR/bin/lightnvr"
+        else
+            echo "Could not find libsod.so in the build directory."
+            echo "This suggests a problem with building the shared library."
+        fi
+    fi
+fi
+
 # Look for test binaries
 if [ "$ENABLE_TESTS" -eq 1 ] && [ "$ENABLE_SOD" -eq 1 ]; then
     if [ -f "$BUILD_DIR/bin/test_sod_realnet" ]; then
@@ -234,4 +263,4 @@ fi
 if [ -f "$BUILD_DIR/bin/lightnvr" ]; then
     ln -sf "$BUILD_DIR/bin/lightnvr" lightnvr
     echo "Created symbolic link: lightnvr -> $BUILD_DIR/bin/lightnvr"
-fi
+fi