From 0c4d3a954c38b2d354b6d722b9c27f6c3ef098c8 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Thu, 22 Sep 2022 19:52:43 +0200 Subject: [PATCH] Fix rpath for private libraries on Linux Installing audacity on Linux will produce private libraries that have `RUNPATH` set to the build directory instead of the installation directory. The root cause is that the library directory is copied to the installation directory without touching the libraries. The cmake wiki says in RPATH handling caveats [1]: "Since install-side RPATH tweaking is an operation that is done by target-specific installation handling, any target that should have its install RPATH changed (e.g. to `CMAKE_INSTALL_RPATH`) needs to end up in the installation via an `install(TARGETS ...)` signature and not via directory-based copying." So replace `install(DIRECTORY ...)` by individual `install(TARGETS ...)` for the libraries and modules. Then cmake will replace the `RUNPATH` to `$ORIGIN/../lib/audacity`, which is still incorrect. Therefore set `INSTALL_RPATH` explicitly. Fixes: https://github.com/audacity/audacity/issues/3289 Forwarded: https://github.com/audacity/audacity/pull/3671 [1] https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#caveats Signed-off-by: Benjamin Drung Gbp-Pq: Name Fix-rpath-for-private-libraries-on-Linux.patch --- CMakeLists.txt | 1 + .../cmake-modules/AudacityFunctions.cmake | 18 ++++++++++++++++++ modules/mod-script-pipe/CMakeLists.txt | 1 + src/CMakeLists.txt | 5 ----- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38456785..2b495e56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -425,6 +425,7 @@ set( INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ) set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" ) set( _DATADIR "${CMAKE_INSTALL_DATADIR}" ) set( _PKGLIB "${_LIBDIR}/audacity" ) +set( _PKGMODULE "${_PKGLIB}/modules" ) set( _PKGDATA "${_DATADIR}/audacity/" ) set( _MANDIR "${CMAKE_INSTALL_MANDIR}" ) set( _MODDIR "${_PKGLIB}/modules" ) diff --git a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake index b51c6041..ac9f583d 100644 --- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake +++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake @@ -472,6 +472,17 @@ function ( make_interface_alias TARGET REAL_LIBTYTPE ) endif() endfunction() +# Call install(TARGETS...) only on Linux systems (i.e. exclude MacOS and Windows) +macro( install_target_linux target destination ) + if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" ) + install( TARGETS "${target}" DESTINATION "${destination}" ) + endif() +endmacro() + +macro( install_audacity_module target ) + install_target_linux( "${target}" "${_PKGMODULE}" ) +endmacro() + function( audacity_module_fn NAME SOURCES IMPORT_TARGETS ADDITIONAL_DEFINES ADDITIONAL_LIBRARIES LIBTYPE ) @@ -515,6 +526,7 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS PROPERTIES PREFIX "" FOLDER "modules" # for IDE organization + INSTALL_RPATH "$ORIGIN/.." ) if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" ) @@ -599,6 +611,12 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS collect_edges( ${TARGET} "${IMPORT_TARGETS}" ${LIBTYPE} ) set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE ) + # Note: Some modules set EXCLUDE_FROM_ALL afterwards to not be installed. + # Therefore only install libraries, but not modules here. + if( NOT REAL_LIBTYPE STREQUAL "MODULE" ) + install_target_linux( "${TARGET}" "${_PKGLIB}" ) + endif() + # collect unit test targets if they are present if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests") add_subdirectory(tests) diff --git a/modules/mod-script-pipe/CMakeLists.txt b/modules/mod-script-pipe/CMakeLists.txt index 5ee18627..ccfd50f4 100644 --- a/modules/mod-script-pipe/CMakeLists.txt +++ b/modules/mod-script-pipe/CMakeLists.txt @@ -15,3 +15,4 @@ set( DEFINES ) audacity_module( mod-script-pipe "${SOURCES}" "Audacity" "${DEFINES}" "" ) +install_audacity_module( mod-script-pipe ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ab0b3cc2..2b34e9d9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1426,11 +1426,6 @@ else() RUNTIME RESOURCE DESTINATION "${_PKGDATA}" ) - install( DIRECTORY "${_DEST}/${_LIBDIR}/" - DESTINATION "${_LIBDIR}" - USE_SOURCE_PERMISSIONS - FILES_MATCHING PATTERN "*.so*" ) - install( FILES "${_INTDIR}/audacity.desktop" DESTINATION "${_DATADIR}/applications" ) install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.md" -- 2.30.2