diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-09-20 14:08:51 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-09-20 14:08:51 +0000 |
| commit | ba1f254fce19f57b8f2b969412b6fc107822ce90 (patch) | |
| tree | 8956a70ebe2ca189fa45369e09e91069f24dfd86 /main/zeromq | |
| parent | 78075744e7705bf9c5af51708b119ce1f2b09645 (diff) | |
| download | aports-ba1f254fce19f57b8f2b969412b6fc107822ce90.tar.bz2 aports-ba1f254fce19f57b8f2b969412b6fc107822ce90.tar.xz | |
main/zeromq: use system openpgm, and fix build against musl
Diffstat (limited to 'main/zeromq')
| -rw-r--r-- | main/zeromq/APKBUILD | 27 | ||||
| -rw-r--r-- | main/zeromq/fix-openpgm-detection.patch | 44 |
2 files changed, 62 insertions, 9 deletions
diff --git a/main/zeromq/APKBUILD b/main/zeromq/APKBUILD index 1a2e93149e..ddb5dd00dc 100644 --- a/main/zeromq/APKBUILD +++ b/main/zeromq/APKBUILD @@ -2,22 +2,28 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zeromq pkgver=3.2.3 -pkgrel=0 +pkgrel=1 pkgdesc="The ZeroMQ messaging library and tools" url="http://www.zeromq.org/" arch="all" license="LGPLv3+" depends= -makedepends="util-linux-dev perl python" +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" - +source="http://download.zeromq.org/zeromq-$pkgver.tar.gz + fix-openpgm-detection.patch" _builddir="$srcdir"/$pkgname-$pkgver - prepare() { cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + aclocal && autoconf && automake --add-missing || return 1 + update_config_sub || return 1 } build() { @@ -27,7 +33,7 @@ build() { --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ - --with-pgm \ + --with-system-pgm \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ || return 1 @@ -46,6 +52,9 @@ libzmq() { mv "$pkgdir"/usr/lib/libzmq.so.* "$subpkgdir"/usr/lib/ } -md5sums="1abf8246363249baf5931a065ee38203 zeromq-3.2.3.tar.gz" -sha256sums="e134c1aaf829dd77bca9dc0fa199ba31095a581bd0d3dda5fc59523b9f401238 zeromq-3.2.3.tar.gz" -sha512sums="34ffb6aa645f62bd1158a8f2888bf92929ccf90917a6c50ed51ed1240732f498522e164d1536f26480c87ad5457fe614a93bf0e15f2f89b0b168e64a30de68ca zeromq-3.2.3.tar.gz" +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" diff --git a/main/zeromq/fix-openpgm-detection.patch b/main/zeromq/fix-openpgm-detection.patch new file mode 100644 index 0000000000..c310c956c4 --- /dev/null +++ b/main/zeromq/fix-openpgm-detection.patch @@ -0,0 +1,44 @@ +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 + |