From 2a7922644ea9852e62f09623efededed5c04ebd0 Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 31 Aug 2019 06:35:55 -0300 Subject: [PATCH] main/rabbitmq-c: upgrade to 0.9.0 --- main/rabbitmq-c/APKBUILD | 34 ++++++++++++++++++---------------- main/rabbitmq-c/musl-fix.patch | 11 ----------- 2 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 main/rabbitmq-c/musl-fix.patch diff --git a/main/rabbitmq-c/APKBUILD b/main/rabbitmq-c/APKBUILD index 546945b2c07..13380c86866 100644 --- a/main/rabbitmq-c/APKBUILD +++ b/main/rabbitmq-c/APKBUILD @@ -1,18 +1,16 @@ # Contributor: Fabio Ribeiro # Maintainer: Fabio Ribeiro pkgname=rabbitmq-c -pkgver=0.8.0 -pkgrel=5 +pkgver=0.9.0 +pkgrel=0 pkgdesc="RabbitMQ C client" url="https://github.com/alanxz/rabbitmq-c" arch="all" license="MIT" -depends_dev="openssl-dev popt-dev" -makedepends="$depends_dev cmake xmlto doxygen" -subpackages="$pkgname-utils $pkgname-doc $pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/alanxz/$pkgname/archive/v$pkgver.tar.gz - musl-fix.patch" -builddir="$srcdir/$pkgname-$pkgver" +depends_dev="popt-dev" +makedepends="$depends_dev openssl-dev cmake xmlto doxygen" +subpackages="$pkgname-utils $pkgname-doc::noarch $pkgname-dev" +source="$pkgname-$pkgver.tar.gz::https://github.com/alanxz/rabbitmq-c/archive/v$pkgver.tar.gz" build() { cd "$builddir" @@ -22,13 +20,23 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_C_FLAGS="$CFLAGS" \ - || return 1 + -DBUILD_STATIC_LIBS=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DENABLE_SSL_SUPPORT=ON \ + -DBUILD_TESTS=ON \ + -DBUILD_TOOLS=ON make } +check() { + cd "$builddir"/build + ctest -E basic +} + package() { cd "$builddir"/build make DESTDIR="$pkgdir" install + rm -f "$pkgdir"/usr/lib/*.a } utils() { @@ -40,16 +48,10 @@ utils() { doc() { pkgdesc="$pkgdesc (documentation and examples)" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/"$pkgname" cp -a "$builddir"/build/docs "$builddir"/examples \ "$subpkgdir"/usr/share/"$pkgname"/ } -md5sums="51d5827651328236ecb7c60517c701c2 rabbitmq-c-0.8.0.tar.gz -034d4367f68c0ff5a6f019c8c17279d7 musl-fix.patch" -sha256sums="d8ed9dcb49903d83d79d7b227da35ef68c60e5e0b08d0fc1fb4e4dc577b8802b rabbitmq-c-0.8.0.tar.gz -098ba5ad4fa5bb6f05d10ead47e1b6f8a39d5a9499c2c796a328f1d71a2f3042 musl-fix.patch" -sha512sums="54e1c98a6b0eb7de848c9fac13dcde6455a6f71acee9e62a96c171f0e3e1cf860a70837f07b633d1a55b1ffd3d33ed7186b52495fa4c6e755b69a7e728eb9f1a rabbitmq-c-0.8.0.tar.gz -da88bf18dc43800b1344f1274d5bafd99784119882593d13e3401bdd5c9bf52ac1a4af4af433ba1b9b0ae4627ffa08ce53486ec0f8a51593ed1e9db3dae54840 musl-fix.patch" +sha512sums="a63fe267a3ec112a5e9456a03066132b91f897181947fba18ea3efb14ca0a69996d7dfaecda61a0dd360e03a4e56569e70592e1674b75d20b937a118e1acfc64 rabbitmq-c-0.9.0.tar.gz" diff --git a/main/rabbitmq-c/musl-fix.patch b/main/rabbitmq-c/musl-fix.patch deleted file mode 100644 index e76b082f92d..00000000000 --- a/main/rabbitmq-c/musl-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./librabbitmq/amqp_private.h.orig -+++ ./librabbitmq/amqp_private.h -@@ -262,7 +262,7 @@ - } - - /* Determine byte order */ --#if defined(__GLIBC__) -+#if defined(__linux__) - # include - # if (__BYTE_ORDER == __LITTLE_ENDIAN) - # define AMQP_LITTLE_ENDIAN