diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-11-10 15:14:10 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-11-10 15:14:44 +0100 |
| commit | 470e520be3fe731c9d11a3540d3ac27fd6aa2221 (patch) | |
| tree | a1b6b33a5f3b72e6a7a88abc504df07c8faf0c0e /community/lua-mpack | |
| parent | 3cce77bfd3dd0c854efff3969801379484a29516 (diff) | |
| download | aports-470e520be3fe731c9d11a3540d3ac27fd6aa2221.tar.bz2 aports-470e520be3fe731c9d11a3540d3ac27fd6aa2221.tar.xz | |
community/lua-mpack: upgrade to 1.0.7
Diffstat (limited to 'community/lua-mpack')
| -rw-r--r-- | community/lua-mpack/APKBUILD | 30 | ||||
| -rw-r--r-- | community/lua-mpack/dont-download-libmpack.patch | 23 |
2 files changed, 9 insertions, 44 deletions
diff --git a/community/lua-mpack/APKBUILD b/community/lua-mpack/APKBUILD index cf09edcedc..0499032e9d 100644 --- a/community/lua-mpack/APKBUILD +++ b/community/lua-mpack/APKBUILD @@ -3,21 +3,18 @@ pkgname=lua-mpack _rockname=mpack _pkgname=libmpack-lua -pkgver=1.0.6 -pkgrel=1 -_libmpack_ver=1.0.4 +pkgver=1.0.7 +pkgrel=0 pkgdesc="Libmpack bindings for Lua" url="https://github.com/libmpack/libmpack-lua" arch="all" license="MIT" -makedepends="libmpack-dev" +makedepends="libmpack-dev>=1.0.5" checkdepends="lua-busted" subpackages="" source="$_pkgname-$pkgver.tar.gz::https://github.com/libmpack/$_pkgname/archive/$pkgver.tar.gz - libmpack-$_libmpack_ver.tar.gz::https://github.com/libmpack/libmpack/archive/$_libmpack_ver.tar.gz skip-memleak-test.patch - dont-install-busted.patch - dont-download-libmpack.patch" + dont-install-busted.patch" builddir="$srcdir/$_pkgname-$pkgver" _luaversions="5.1 5.2 5.3" @@ -27,15 +24,6 @@ for _v in $_luaversions; do done prepare() { - cd "$builddir" - - local libver=$(sed -En "s/^MPACK_VERSION\s*\??=\s*([^ ]+).*/\1/p" Makefile) - if [ "$libver" != "$_libmpack_ver" ]; then - warning "libmpack-lua should be built with libmpack $libver, not $_libmpack_ver!" - fi - - ln -s "$srcdir"/libmpack-$_libmpack_ver mpack-src - default_prepare local lver; for lver in $_luaversions; do @@ -47,9 +35,9 @@ build() { local lver; for lver in $_luaversions; do msg "Building for Lua $lver..." make -C "$builddir-$lver" \ - CFLAGS="$CFLAGS -lmpack" \ FETCH=false \ USE_SYSTEM_LUA=yes \ + USE_SYSTEM_MPACK=yes \ LUA_INCLUDE="$(pkg-config --cflags lua$lver)" \ LUA_LIB="$(pkg-config --libs lua$lver)" done @@ -60,6 +48,7 @@ check() { msg "Testing on Lua $lver..." make -C "$builddir-$lver" \ USE_SYSTEM_LUA=yes \ + USE_SYSTEM_MPACK=yes \ LUA=/usr/bin/lua$lver \ BUSTED=/usr/bin/busted-$lver \ test @@ -78,6 +67,7 @@ _subpackage() { make -C "$builddir-$lver" \ USE_SYSTEM_LUA=yes \ + USE_SYSTEM_MPACK=yes \ LUA_CMOD_INSTALLDIR="$(pkg-config --variable=INSTALL_CMOD lua$lver)" \ DESTDIR="$subpkgdir" \ install @@ -86,8 +76,6 @@ _subpackage() { echo 'rock_manifest = {}' > "$rockdir"/rock_manifest } -sha512sums="3a2f0697f94957c15a78ff24b296a034f301d1e8ab51d5636389f0fad7be838d450c59038c61d4173fa9e0463aa5565cfc0c35c273b4961a5e5631d343ca0605 libmpack-lua-1.0.6.tar.gz -8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c libmpack-1.0.4.tar.gz +sha512sums="301eb78ca22a75bcabc61eebf6d67f6e5a2d3535d34c0ab6e034495e5bdd0571842397a8f36d42abbdfacf240860f807c93e3ace8ed42543e2322914d84c1a36 libmpack-lua-1.0.7.tar.gz af6b670c1007aa86b696798ede30d17addc45d27dd7e78be6e7bd4a3eac931a9ce47b8e12d8146dadf44c80d21917983a836915dd8f0c33abf3be0381a24a642 skip-memleak-test.patch -f688f34c6893dbb4590b93e14de459c33d8efe621a41699a36286b117b874fac37fe473ef46ad2f2855c4672d90defb600c7e93555989d0c45a4964fda49c5a9 dont-install-busted.patch -6c151d65f2f5c2e5e5b5f851035a7be478544cf4152e40d81d2abdca724a6e41b3767e37e9ed59f1aa8d269477ae768716f7c6e4dfc93bc3cf577e83c6c0da56 dont-download-libmpack.patch" +f688f34c6893dbb4590b93e14de459c33d8efe621a41699a36286b117b874fac37fe473ef46ad2f2855c4672d90defb600c7e93555989d0c45a4964fda49c5a9 dont-install-busted.patch" diff --git a/community/lua-mpack/dont-download-libmpack.patch b/community/lua-mpack/dont-download-libmpack.patch deleted file mode 100644 index 2dc76cc97f..0000000000 --- a/community/lua-mpack/dont-download-libmpack.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -66,7 +66,7 @@ - mkdir -p $$dir && cd $$dir && \ - $(FETCH) $(MPACK_URL) | $(UNTGZ) - --release: mpack-src -+release: - rm -f libmpack-lua-$(LMPACK_VERSION).tar.gz - tar cvfz libmpack-lua-$(LMPACK_VERSION).tar.gz \ - --transform 's,^,libmpack-lua-$(LMPACK_VERSION)/,' \ -@@ -95,10 +95,10 @@ - $(DEPS_PREFIX)/lib/luarocks/rocks/busted/2.0.rc12-1/bin/busted test.lua - - ifeq ($(USE_SYSTEM_LUA),no) --$(MPACK): $(LUAROCKS) mpack-src lmpack.c -+$(MPACK): $(LUAROCKS) lmpack.c - $(LUAROCKS) make CFLAGS='$(CFLAGS)' - else --$(MPACK): mpack-src lmpack.c -+$(MPACK): lmpack.c - $(CC) -shared $(CFLAGS) $(INCLUDES) $(LDFLAGS) $^ -o $@ $(LIBS) - endif |