diff options
| -rw-r--r-- | testing/libcli/APKBUILD | 21 | ||||
| -rw-r--r-- | testing/libcli/gcc-5.2-fix.patch | 11 |
2 files changed, 10 insertions, 22 deletions
diff --git a/testing/libcli/APKBUILD b/testing/libcli/APKBUILD index 1af049e8aa..fc742ca39c 100644 --- a/testing/libcli/APKBUILD +++ b/testing/libcli/APKBUILD @@ -1,26 +1,25 @@ # Contributor: arch3y <arch3y@riseup.net> # Maintainer: arch3y <arch3y@riseup.net> pkgname=libcli -pkgver=1.9.7 -pkgrel=2 +pkgver=1.10.0 +pkgrel=0 pkgdesc="A library for including a Cisco-like command-line interface" url="https://github.com/dparrish/libcli" arch="all" options="!check" license="LGPL-2.0-or-later" -source="$pkgname-$pkgver.tar.gz::https://github.com/dparrish/libcli/archive/v$pkgver.tar.gz - gcc-5.2-fix.patch" -builddir="$srcdir/$pkgname-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/dparrish/libcli/archive/v$pkgver.tar.gz" build() { - cd "$builddir" - make + make DYNAMIC_LIB=1 STATIC_LIB=0 TESTS=1 +} + +check() { + ./clitest } package() { - cd "$builddir" - make PREFIX=/usr DESTDIR="$pkgdir" install + make PREFIX=/usr DESTDIR="$pkgdir" STATIC_LIB=0 install } -sha512sums="b2dacfd40bc068ddcc0dc3d60576ef2f7d7e2af80b93c6e7ae899d654afca6f0f8d2df2b33c9c8e760bdbea9aa2eaf757029d46032dcf307341f78f1a8f4f66f libcli-1.9.7.tar.gz -4e8a3741e79f764a006bf6822ae503d6e8ff6a67a984f03e2006ed393f78b259846c64640288ee5f59074eb1730e41ec1af3b7f5307885c8e671b1096a9bea15 gcc-5.2-fix.patch" +sha512sums="0d8aaad55982581aef637a30f8824557d8460f95503d9731df15a176af7a5b928945bacff0d0cbbc1f4c196ac0c7bc207197cca1873f8f57cd511962f1bbed19 libcli-1.10.0.tar.gz" diff --git a/testing/libcli/gcc-5.2-fix.patch b/testing/libcli/gcc-5.2-fix.patch deleted file mode 100644 index 0f2232ea73..0000000000 --- a/testing/libcli/gcc-5.2-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libcli-1.9.7.orig/clitest.c -+++ libcli-1.9.7/clitest.c -@@ -72,7 +72,7 @@ - int cmd_test(struct cli_def *cli, const char *command, char *argv[], int argc) - { - int i; -- cli_print(cli, "called %s with \"%s\"", __FUNCTION__, command); -+ cli_print(cli, "called %s with \"%s\"", __func__, command); - cli_print(cli, "%d arguments:", argc); - for (i = 0; i < argc; i++) - cli_print(cli, " %s", argv[i]); |