diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-10 07:36:53 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-10 07:36:53 +0000 |
commit | 56b1b14ccb762ca5d21b91885210a5ddb9f4eabb (patch) | |
tree | dc1dddbdc00454fab77886ae9ba3fb17187c3896 /main/zeromq | |
parent | 86a8e9bc5a7d65784c3b6facd9ce3785d67debc5 (diff) | |
download | aports-56b1b14ccb762ca5d21b91885210a5ddb9f4eabb.tar.bz2 aports-56b1b14ccb762ca5d21b91885210a5ddb9f4eabb.tar.xz |
Revert "main/zeromq: rebuild against new libsodium"
This reverts commit f7b1329246ad82d073b79490a585eca0e991081d.
Diffstat (limited to 'main/zeromq')
-rw-r--r-- | main/zeromq/APKBUILD | 22 | ||||
-rw-r--r-- | main/zeromq/configure_werror.patch | 11 |
2 files changed, 10 insertions, 23 deletions
diff --git a/main/zeromq/APKBUILD b/main/zeromq/APKBUILD index b18b5cdf9f..538412279c 100644 --- a/main/zeromq/APKBUILD +++ b/main/zeromq/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Valery Kartel <valery.kartel@gmail.com> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zeromq pkgver=4.1.3 -pkgrel=1 +pkgrel=0 pkgdesc="The ZeroMQ messaging library and tools" url="http://www.zeromq.org/" arch="all" @@ -12,8 +12,7 @@ makedepends="util-linux-dev libsodium-dev perl python asciidoc xmlto autoconf automake" install= subpackages="$pkgname-dev $pkgname-doc libzmq" -source="http://download.zeromq.org/zeromq-$pkgver.tar.gz - configure_werror.patch" +source="http://download.zeromq.org/zeromq-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -29,6 +28,8 @@ prepare() { build() { cd "$_builddir" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -40,18 +41,15 @@ build() { package() { cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } libzmq() { pkgdesc="The ZeroMQ messaging library" - install -d "$subpkgdir"/usr/lib + mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libzmq.so.* "$subpkgdir"/usr/lib/ } -md5sums="d0824317348cfb44b8692e19cc73dc3a zeromq-4.1.3.tar.gz -ba9f21b1f1b480ebf98969ad6f91da79 configure_werror.patch" -sha256sums="61b31c830db377777e417235a24d3660a4bcc3f40d303ee58df082fcd68bf411 zeromq-4.1.3.tar.gz -f802dc9217c9d3a4b756b4b5d3fd4cf2e59accecf154bf96955ab504298cde3a configure_werror.patch" -sha512sums="2c993d18ea44e1cba890e024176af65b85b842ca4f8a22d319be4ace8388ab8828dd706b065f02754025bf271b1d7aa878c3f6655878248f7826452cb2a6134c zeromq-4.1.3.tar.gz -baef095918e817f6bf7c267307e67dcd97c8ab568705f02d7a863a9ffe006acd9cc2aac238ac25cc2fdf787caf9d09f95109b8c368e1ad347a8a935ccc124549 configure_werror.patch" +md5sums="d0824317348cfb44b8692e19cc73dc3a zeromq-4.1.3.tar.gz" +sha256sums="61b31c830db377777e417235a24d3660a4bcc3f40d303ee58df082fcd68bf411 zeromq-4.1.3.tar.gz" +sha512sums="2c993d18ea44e1cba890e024176af65b85b842ca4f8a22d319be4ace8388ab8828dd706b065f02754025bf271b1d7aa878c3f6655878248f7826452cb2a6134c zeromq-4.1.3.tar.gz" diff --git a/main/zeromq/configure_werror.patch b/main/zeromq/configure_werror.patch deleted file mode 100644 index 189d49bd8e..0000000000 --- a/main/zeromq/configure_werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- old/configure 2015-08-17 13:49:50.000000000 +0300 -+++ new/configure 2015-11-07 00:38:52.426666674 +0200 -@@ -17086,7 +17086,7 @@ - - - # By default compiling with -Werror except OSX. --libzmq_werror="yes" -+libzmq_werror="no" - - # By default use DSO visibility - libzmq_dso_visibility="yes" |