diff options
Diffstat (limited to 'main/zeromq')
| -rw-r--r-- | main/zeromq/APKBUILD | 17 | ||||
| -rw-r--r-- | main/zeromq/fix-openpgm-detection.patch | 44 |
2 files changed, 6 insertions, 55 deletions
diff --git a/main/zeromq/APKBUILD b/main/zeromq/APKBUILD index ddb5dd00dc..37c29fd581 100644 --- a/main/zeromq/APKBUILD +++ b/main/zeromq/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zeromq -pkgver=3.2.3 -pkgrel=1 +pkgver=3.2.4 +pkgrel=0 pkgdesc="The ZeroMQ messaging library and tools" url="http://www.zeromq.org/" arch="all" @@ -11,8 +11,7 @@ depends= makedepends="util-linux-dev openpgm-dev perl python autoconf automake" install= subpackages="$pkgname-dev $pkgname-doc libzmq" -source="http://download.zeromq.org/zeromq-$pkgver.tar.gz - fix-openpgm-detection.patch" +source="http://download.zeromq.org/zeromq-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -22,7 +21,6 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - aclocal && autoconf && automake --add-missing || return 1 update_config_sub || return 1 } @@ -52,9 +50,6 @@ libzmq() { mv "$pkgdir"/usr/lib/libzmq.so.* "$subpkgdir"/usr/lib/ } -md5sums="1abf8246363249baf5931a065ee38203 zeromq-3.2.3.tar.gz -99b227419997736cf348fe8beb077831 fix-openpgm-detection.patch" -sha256sums="e134c1aaf829dd77bca9dc0fa199ba31095a581bd0d3dda5fc59523b9f401238 zeromq-3.2.3.tar.gz -c171edd8896c9770b004a385c3b25182480e12680ff0708c0fd8e3d6d00eb3aa fix-openpgm-detection.patch" -sha512sums="34ffb6aa645f62bd1158a8f2888bf92929ccf90917a6c50ed51ed1240732f498522e164d1536f26480c87ad5457fe614a93bf0e15f2f89b0b168e64a30de68ca zeromq-3.2.3.tar.gz -2050042aee39ade064a613689ad1e9d4fd618350100cdc64e85f5830d6e1843b7992278cd6afddff2c256ecc8eb1475d00bb2aac0dd5740cce78267239de3412 fix-openpgm-detection.patch" +md5sums="39af2d41e3fb744b98d7999e291e05dc zeromq-3.2.4.tar.gz" +sha256sums="df96a141c85b65c2cb6c0db22223126623a09eecbfccb7f74400f3f938742f59 zeromq-3.2.4.tar.gz" +sha512sums="d8eef84860bc5314b42a2cc210340572a9148e008ea65f7650844d0edbe457d6758785047c2770399607f69ba3b3a544db9775a5cdf961223f7e278ef7e0f5c6 zeromq-3.2.4.tar.gz" diff --git a/main/zeromq/fix-openpgm-detection.patch b/main/zeromq/fix-openpgm-detection.patch deleted file mode 100644 index c310c956c4..0000000000 --- a/main/zeromq/fix-openpgm-detection.patch +++ /dev/null @@ -1,44 +0,0 @@ -b0e82176f98aa80bed1e874dd36b72bc314b4 Mon Sep 17 00:00:00 2001 -From: Jose Pedro Oliveira <jpo@di.uminho.pt> -Date: Sat, 1 Jun 2013 03:39:40 +0100 -Subject: [PATCH] Make ./configure --with-system-pgm detect the OpenPGM 5.2 - system library. - -Note that OpenPGM installs a versioned pkgconfig file -(openpgm-5.2.pc, openpgm-5.1.pc). ---- -[timo.teras@iki.fi: backported to older zeromq] - - configure.ac | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7264445..001db2d 100644 ---- a/configure.in -+++ b/configure.in -@@ -349,10 +349,18 @@ fi - # Build with system openpgm - if test "x$with_system_pgm_ext" != "xno"; then - m4_ifdef([PKG_CHECK_MODULES], [ -- PKG_CHECK_MODULES([OpenPGM], [openpgm-5.1 >= 5.1]) -- AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension]) -- LIBZMQ_EXTRA_CXXFLAGS="$OpenPGM_CFLAGS $LIBZMQ_EXTRA_CXXFLAGS" -- LIBS="$OpenPGM_LIBS $LIBS" -+ have_pgm_system_library="no" -+ PKG_CHECK_MODULES([OpenPGM], [openpgm-5.2 >= 5.2], -+ [ have_pgm_system_library="yes" ], -+ [PKG_CHECK_MODULES([OpenPGM], [openpgm-5.1 >= 5.1], -+ [ have_pgm_system_library="yes" ]) -+ ] -+ ) -+ if test "x$have_pgm_system_library" = "xyes"; then -+ AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension]) -+ LIBZMQ_EXTRA_CXXFLAGS="$OpenPGM_CFLAGS $LIBZMQ_EXTRA_CXXFLAGS" -+ LIBS="$OpenPGM_LIBS $LIBS" -+ fi - ], - [AC_MSG_ERROR([--with-system-pgm requires a working pkg-config installation])]) - fi --- -1.8.1.6 - |