diff options
| author | Jiří Klimeš | 2020-01-27 14:55:27 +0100 |
|---|---|---|
| committer | Jiří Klimeš | 2020-01-27 15:24:22 +0100 |
| commit | da8a3692016358bbce06d45465bdb3298d283cab (patch) | |
| tree | a7045b60260e6e671abe017ba506519cc3562c8b | |
| parent | 750f3a8db82fe8cc3b00ca0a579ce5da0edcb157 (diff) | |
| download | aur-da8a3692016358bbce06d45465bdb3298d283cab.tar.gz | |
Fix build on updated kernel with not-cleaned-build-source
tecmake.mak creates lib directory named after a Linux version, like Linux420_64.
When there was an older directory in source (e.g. Linux419_64), the install command
tried to install files from both directories and failed with errors like:
install: will not overwrite just-created '.../libim/pkg/libim/usr/lib/libim.a' with '.../libim/src/im/lib/Linux54_64/libim.a
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 9 |
2 files changed, 7 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = libim pkgdesc = Toolkit for digital imaging pkgver = 3.13 - pkgrel = 1 + pkgrel = 2 url = https://www.tecgraf.puc-rio.br/im/ arch = i686 arch = x86_64 @@ -6,7 +6,7 @@ pkgbase=libim pkgname=('libim' 'lua-im' 'lua51-im' 'lua52-im') pkgver=3.13 -pkgrel=1 +pkgrel=2 pkgdesc="Toolkit for digital imaging" arch=('i686' 'x86_64') url="https://www.tecgraf.puc-rio.br/im/" @@ -51,8 +51,10 @@ package_libim() { pkgdesc="Imaging toolkit library" depends=('zlib' 'libpng') + _linux_ver="Linux$(uname -r | awk -v FS='.' -v OFS='' {'print $1,$2'})_64" + install -m755 -d "$pkgdir"/usr/lib - install -m644 "$srcdir"/im/lib/Linux*/libim* "$pkgdir"/usr/lib + install -m644 "$srcdir"/im/lib/${_linux_ver}/libim* "$pkgdir"/usr/lib install -m755 -d "$pkgdir"/usr/share/$pkgname install -m644 "$srcdir"/im-${pkgver}_Docs.pdf "$pkgdir"/usr/share/$pkgname install -m755 -d "$pkgdir"/usr/include/im @@ -65,11 +67,12 @@ _lua_im_package_helper() { _lua_ver=$1 _lua_ver_nodot=`echo $1 | cut -c1,3` + _linux_ver="Linux$(uname -r | awk -v FS='.' -v OFS='' {'print $1,$2'})_64" mkdir -p "$pkgdir"/usr/share/licenses/$pkgname install -Dm644 "$srcdir"/im/COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/LICENSE install -d "$pkgdir"/usr/lib/lua/${_lua_ver} - install -Dm644 "$srcdir"/im/lib/Linux*_??/Lua${_lua_ver_nodot}/*.so "$pkgdir"/usr/lib/lua/${_lua_ver} + install -Dm644 "$srcdir"/im/lib/${_linux_ver}/Lua${_lua_ver_nodot}/*.so "$pkgdir"/usr/lib/lua/${_lua_ver} # create symlinks required for Lua modules for name in \ |