Skip to content

libzip: Use /usr/lib as libdir #1036

Merged
merged 1 commit into from
Feb 11, 2019
Merged

Conversation

pmenzel
Copy link
Collaborator

@pmenzel pmenzel commented Feb 11, 2019

Unfortunately the upgrade procedure is messed up, when having already upgraded to libzip 1.5.1-0.

$ sudo bee update -f libzip-0.10-1.x86_64
installing /src/mariux/beeroot/packages/libzip-0.10-1.x86_64.bee.tar.bz2 ..
removing libzip-1.5.1-1.x86_64 ..
$ sudo bee update libzip-1.5.1-1
installing /src/mariux/beeroot/packages/libzip-1.5.1-1.x86_64.bee.tar.bz2 ..
removing libzip-0.10-1.x86_64 ..
$ ls -l /usr/lib/pkgconfig/libzip.pc
-rw-r--r-- 1 root root 305 Feb 11 18:31 /usr/lib/pkgconfig/libzip.pc

Tested on keineahnung.

On MarIuX `/usr/lib64` is a symbolic link to `/usr/lib`.

    $ ls -ld /usr/lib*
    drwxr-xr-x 240 root root 143360 Feb 11 16:51 /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

[CMake sets the `LIBDIR` to `lib64` by default.][1] This causes problems
when updating packages, where the same files where in `/usr/lib`
beforehand, as Bee will remove files, when removing the older package,
as it is unaware of the symbolic link.

    $ sudo bee query libzip.pc
    libzip-0.10-1.x86_64
      /usr/lib/pkgconfig/libzip.pc
    $ sudo bee update libzip
    $ tail -2 /usr/share/bee/libzip-1.5.1-0.x86_64/CONTENT
    type=directory:mode=040755:access=0755:uid=0:user=root:gid=0:group=root:size=60:mtime=1549900187:nlink=2:file=/usr/lib64/pkgconfig
    type=regular:mode=0100644:access=0644:uid=0:user=root:gid=0:group=root:size=302:mtime=1549900185:nlink=1:md5=aed6fcf96127fe49130955b6d670229f:file=/usr/lib64/pkgconfig/libzip.pc
    $ ls -l /usr/lib64/pkgconfig/libzip.pc
    ls: cannot access /usr/lib64/pkgconfig/libzip.pc: No such file or directory

Rebuild this package with Bee’s fixed CMake build type, where
`CMAKE_INSTALL_LIBDIR` is set to `/usr/lib`.

    [BEE] cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib /dev/shm/bee-root/libzip/libzip-1.5.1-1/source

Increment the revision to 1.

[1]: https://cmake.org/cmake/help/v3.8/module/GNUInstallDirs.html
@pmenzel pmenzel changed the title libzip: Use libdir /usr/lib libzip: Use /usr/lib as libdir Feb 11, 2019
@pmenzel pmenzel merged commit 50e40f2 into master Feb 11, 2019
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant