diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2018-01-05 00:42:04 +0100 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-01-05 01:14:28 +0100 |
commit | 1b7a54f0e71c6f7449a641078e3deb5d5ccda34d (patch) | |
tree | 991440c4e718d603f1f04f154255f85893fbce46 | |
parent | def3227b2cdaa37f817609786542d26f7a479edd (diff) | |
download | aports-1b7a54f0e71c6f7449a641078e3deb5d5ccda34d.tar.bz2 aports-1b7a54f0e71c6f7449a641078e3deb5d5ccda34d.tar.xz |
main/graphviz: build with lua5.3 instead of lua5.2 and fix destdir
-rw-r--r-- | main/graphviz/APKBUILD | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD index 8281a2a850..b86a5dfd37 100644 --- a/main/graphviz/APKBUILD +++ b/main/graphviz/APKBUILD @@ -8,11 +8,12 @@ pkgdesc="Graph Visualization Tools" url="http://www.graphviz.org/" arch="all" license="EPL-1.0" +_luaver=5.3 depends_dev="zlib-dev libpng-dev libjpeg-turbo-dev expat-dev fontconfig-dev libsm-dev libxext-dev cairo-dev pango-dev librsvg-dev gmp-dev freetype-dev" makedepends="$depends_dev flex swig python2-dev m4 libtool - bison gtk+2.0-dev lua5.2-dev libltdl tcl autoconf automake" + bison gtk+2.0-dev lua$_luaver-dev libltdl tcl autoconf automake" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/graphviz" subpackages="$pkgname-dev $pkgname-doc py-gv:py lua-$pkgname:_lua @@ -38,9 +39,8 @@ build() { cd "$builddir" LIBPOSTFIX=/ \ - LUA=lua5.2 \ - LUA_CFLAGS="$(pkg-config --cflags lua5.2)" \ - LUA_LIBS="$(pkg-config --libs lua5.2)" \ + LUA=lua$_luaver \ + lua_suffix=$_luaver \ ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -104,13 +104,13 @@ py() { } _lua() { - pkgdesc="Lua extension for graphviz" + pkgdesc="Lua5.3 extension for graphviz" mkdir -p "$subpkgdir"/usr/lib/graphviz \ "$subpkgdir"/usr/lib/lua mv "$pkgdir"/usr/lib/graphviz/lua \ - "$subpkgdir"/usr/lib/graphviz - mv "$pkgdir"/usr/lib/lua "$subpkgdir"/usr/lib/ + "$subpkgdir"/usr/lib/graphviz/ + mv "$pkgdir"/usr/lib/lua "$subpkgdir"/usr/lib/lua/$_luaver } gtk() { |