summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiří Klimeš2020-01-27 15:54:51 +0100
committerJiří Klimeš2020-01-27 16:06:02 +0100
commitcd7de9a63a253c621cb1dc82ae1aa495b433089b (patch)
treea74edc550251aa6bab7cca8d8c6643da681c80bc
parentd0fe9b56fd5a4121af7576c9e38bf3f612e903e0 (diff)
downloadaur-cd7de9a63a253c621cb1dc82ae1aa495b433089b.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 '.../libcd/pkg/libcd/usr/lib/libcdcontextplus.so' with '.../libcd/src/cd/lib/Linux54_64/libcdcontextplus.so'
-rw-r--r--PKGBUILD7
1 files changed, 5 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index efe83d9f60b..3b205873df1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -68,8 +68,10 @@ package_libcd() {
pkgdesc="Canvas Draw - 2D vector graphics library"
depends=('libim' 'glu' 'libxmu' 'gtk3')
+ _linux_ver="Linux$(uname -r | awk -v FS='.' -v OFS='' {'print $1,$2'})_64"
+
install -m755 -d "$pkgdir"/usr/lib
- install -m644 "$srcdir"/cd/lib/Linux*/lib*.so "$pkgdir"/usr/lib
+ install -m644 "$srcdir"/cd/lib/${_linux_ver}/lib*.so "$pkgdir"/usr/lib
install -m755 -d "$pkgdir"/usr/share/$pkgname
install -m644 "$srcdir"/cd-${pkgver}_Docs.pdf "$pkgdir"/usr/share/$pkgname
install -m755 -d "$pkgdir"/usr/include/cd
@@ -82,9 +84,10 @@ _lua_cd_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"
install -d "$pkgdir"/usr/lib/lua/${_lua_ver}/
- install -Dm644 "$srcdir"/cd/lib/Linux*_??/Lua${_lua_ver_nodot}/*.so "$pkgdir"/usr/lib/lua/${_lua_ver}/
+ install -Dm644 "$srcdir"/cd/lib/${_linux_ver}/Lua${_lua_ver_nodot}/*.so "$pkgdir"/usr/lib/lua/${_lua_ver}/
install -Dm644 "$srcdir"/cd/COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
# create symlinks required for Lua modules