From 13daff2f4ea3451b0337718acf52ffef81f66c72 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Feb 2019 18:28:53 +0100 Subject: [PATCH] buildtypes/cmake: Set `CMAKE_INSTALL_LIBDIR` to configured `LIBDIR` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s `lib64` by default [1]. > object code libraries (lib or lib64 or lib/ on Debian) This conflicts with the symbolic link in MarIuX. $ ls -ld /usr/lib* drwxr-xr-x 240 root root 143360 Feb 11 18:44 /usr/lib lrwxrwxrwx 1 root root 3 Mar 7 2011 /usr/lib64 -> lib drwxr-xr-x 21 root root 4096 Feb 5 16:45 /usr/libexec Consider the current package has `/usr/lib/pkgconfig/libzip.pc` installed, and the newer version installs the same file into `/usr/lib64/pkgconfig/libzip.pc`. On upgrade, when removing the file from the old package, bee will remove `/usr/lib64/pkgconfig/libzip.pc` because of the symbolic link, which is unwanted. So set it to `LIBDIR`, so that the system configuration is applied. [1]: https://cmake.org/cmake/help/v3.8/module/GNUInstallDirs.html --- buildtypes/cmake.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/buildtypes/cmake.sh.in b/buildtypes/cmake.sh.in index 7314df9..2d90894 100644 --- a/buildtypes/cmake.sh.in +++ b/buildtypes/cmake.sh.in @@ -41,6 +41,7 @@ BEE_BUILDTYPE_CMAKE_SOURCEDIR=${BEE_BUILDTYPE_CMAKE_CMAKELISTSTXT%/*} bee_configure() { start_cmd cmake \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ + -DCMAKE_INSTALL_LIBDIR=${LIBDIR} \ "${@}" \ ${BEE_BUILDTYPE_CMAKE_SOURCEDIR} }