Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
buildtypes/cmake: Set CMAKE_INSTALL_LIBDIR to configured LIBDIR
It’s `lib64` by default [1].

> object code libraries (lib or lib64 or lib/<multiarch-tuple> 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
  • Loading branch information
pmenzel committed Feb 11, 2019
1 parent e77f325 commit 13daff2
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions buildtypes/cmake.sh.in
Expand Up @@ -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}
}
Expand Down

0 comments on commit 13daff2

Please sign in to comment.