diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-06-23 20:02:41 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-06-23 20:02:41 +0800 |
| commit | 0f5b40798a6c122b7104d6bafefcb7decaad2fc3 (patch) | |
| tree | e8c08cd613129c8e3696053b3173aff188e929dd | |
| parent | 3f27cd9a683360843524a42628faa6310e196645 (diff) | |
so upstream dullahan_host's rpath, which is meant to have
$ORIGIN/../lib, would correctly refer to the library dir (where
libcef.so is), without having to manipulate dullahan_host (cause
Flatpak SDK doesn't have patchelf). But Dullahan/CEF is still not
working on Flatpak just yet (LibVLC does, now, after I changed the
prebuilt package from Debian 13 binaries to Fedora 44 binaries,
where libvlccore links to libidn with the same compatibility
version.
| -rw-r--r-- | indra/cmake/UnixInstall.cmake | 2 | ||||
| -rw-r--r-- | indra/llwebrtc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/media_plugins/cef/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/media_plugins/libvlc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake index 65170b5744..34c3ed0ec9 100644 --- a/indra/cmake/UnixInstall.cmake +++ b/indra/cmake/UnixInstall.cmake @@ -15,7 +15,7 @@ if (INSTALL) endif () if (USE_FLATPAK) - set(_LIB lib${ADDRESS_SIZE}) + set(_LIB lib) elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) set(_LIB lib/${ARCH}-linux-gnu/${VIEWER_BINARY_NAME}) elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo)) diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt index 84e7dcf359..6fb4616087 100644 --- a/indra/llwebrtc/CMakeLists.txt +++ b/indra/llwebrtc/CMakeLists.txt @@ -85,7 +85,7 @@ if (INSTALL) if (DARWIN) set(_LIB ../Frameworks) elseif (USE_FLATPAK) - set(_LIB lib${ADDRESS_SIZE}) + set(_LIB lib) elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) set(_LIB lib/${ARCH}-linux-gnu/${VIEWER_BINARY_NAME}) elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo)) diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 98b8bdf538..ee9a709c1e 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -158,7 +158,7 @@ if (INSTALL) ) elseif (LINUX) if (USE_FLATPAK) - set(_LIB lib${ADDRESS_SIZE}) + set(_LIB lib) elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) set(_LIB lib/${ARCH}-linux-gnu/${VIEWER_BINARY_NAME}) elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo)) diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt index 30a0edf80e..24174a6ef0 100644 --- a/indra/media_plugins/libvlc/CMakeLists.txt +++ b/indra/media_plugins/libvlc/CMakeLists.txt @@ -95,7 +95,7 @@ if (INSTALL) DESTINATION ${_LIB}/plugins ) elseif (USE_FLATPAK) - set(_LIB lib${ADDRESS_SIZE}) + set(_LIB lib) install( DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}/vlc DESTINATION ${_LIB} diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index cce94b0d46..42d175fdaa 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -227,7 +227,7 @@ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME} if (LINUX) if (USE_FLATPAK) - set(_LIB lib${ADDRESS_SIZE}) + set(_LIB lib) elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) set(_LIB lib/${ARCH}-linux-gnu/${VIEWER_BINARY_NAME}) elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo)) |