[SCM] muse/master: Force muse modules to be installed under /usr/lib/muse

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Fri Sep 2 12:30:37 UTC 2016


The following commit has been merged in the master branch:
commit 738511efe47d157a4a85a5f2cfb98b60f859709a
Author: James Cowgill <jcowgill at debian.org>
Date:   Fri Sep 2 11:55:32 2016 +0000

    Force muse modules to be installed under /usr/lib/muse
    
    Ubuntu CMake contains the script 'MultiArchCross.cmake' which is invoked for all
    CMake packages and sets CMAKE_INSTALL_LIBDIR to include the multiarch path
    without the install prefix (ie something like "lib/x86_64-linux-gnu"). This
    variable is not defined when building on Debian.
    
    Muse constructs a LIB_INSTALL_DIR variable (when it's not defined) using
    CMAKE_INSTALL_LIBDIR or an alternate fallback. Unfortunately later on in the
    script when handling the RPATH settings, Muse assumes that LIB_INSTALL_DIR is an
    absolute path. This is true on Debian, but not on Ubuntu. This causes a bogus
    RPATH to be inserted into the main Muse executable which prevents Muse from
    finding any of it's modules and immediately crashes on startup.
    
    Ths simple fix is to force LIB_INSTALL_DIR=/usr/lib. Although an Ubuntu specific
    problem, it does no harm to do this on Debian as well.
    
    LP: #1596486

diff --git a/debian/rules b/debian/rules
index 23c9ef1..935021d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ override_dh_clean:
 		-Xmuse/widgets/arrangercolumns.h~ -X*~
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=release
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=release -DLIB_INSTALL_DIR=/usr/lib
 
 override_dh_install:
 	dh_install -pmuse

-- 
muse packaging



More information about the pkg-multimedia-commits mailing list