Date: Thu, 23 Mar 2017 12:37:28 +0100
From: Natanael Copa <ncopa@alpinelinux.org>
To: Leonardo Arena <rnalrd@gmail.com>
Cc: Valery Kartel <valery.kartel@gmail.com>,
 alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH] main/zeromq: upgrade to 4.2.2
Message-ID: <20170323123714.25a0df67@ncopa-desktop.copa.dup.pw>
In-Reply-To: <16e4def4-218a-dcf0-2ce1-c2808e3616e8@gmail.com>
References: <20170323090937.1038-1-valery.kartel@gmail.com>
	<16e4def4-218a-dcf0-2ce1-c2808e3616e8@gmail.com>
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Thu, 23 Mar 2017 12:19:31 +0100
Leonardo Arena <rnalrd@gmail.com> wrote:

> Hi,
> 
> On 23/03/2017 10:09, Valery Kartel wrote:
> > - add check()
> > - cleanups
> > ---
> >  main/zeromq/APKBUILD | 35 ++++++++++++++---------------------
> >  1 file changed, 14 insertions(+), 21 deletions(-)
> > 
> > diff --git a/main/zeromq/APKBUILD b/main/zeromq/APKBUILD
> > index 02c99c1c27..bba293fd83 100644
> > --- a/main/zeromq/APKBUILD
> > +++ b/main/zeromq/APKBUILD
> > @@ -1,25 +1,17 @@
> >  # Contributor: Natanael Copa <ncopa@alpinelinux.org>
> >  # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
> >  pkgname=zeromq
> > -pkgver=4.1.5
> > -pkgrel=1
> > +pkgver=4.2.2
> > +pkgrel=0
> >  pkgdesc="The ZeroMQ messaging library and tools"
> >  url="http://www.zeromq.org/"
> >  arch="all"
> >  license="LGPLv3+ with exceptions"
> > -depends=""
> > -makedepends="util-linux-dev libsodium-dev perl python2 asciidoc xmlto
> > -	autoconf automake"
> > +makedepends="util-linux-dev libsodium-dev libunwind-dev
> > +	perl python2 asciidoc xmlto autoconf automake"
> >  subpackages="$pkgname-dev $pkgname-doc libzmq"
> > -source="https://github.com/zeromq/zeromq4-1/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
> > -
> > -builddir="$srcdir"/$pkgname-$pkgver
> > -
> > -prepare() {
> > -	cd "$builddir"
> > -	update_config_sub || return 1
> > -	default_prepare || return 1
> > -}
> > +source="https://github.com/zeromq/libzmq/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
> > +builddir="$srcdir/$pkgname-$pkgver"
> >  
> >  build() {
> >  	cd "$builddir"
> > @@ -32,20 +24,21 @@ build() {
> >  		--infodir=/usr/share/info \
> >  		--with-libsodium \
> >  		|| return 1
> > -	make || return 1
> > +	make
> > +}
> > +  
> 
> If you remove "|| return 1" it might complicate to backport any patch to
> stable branches.

In this case it does not matter since its the last line in the
function. But in general, yes I want wait with removing the || return
1 til after we branched 3.6-stable.

Thanks!

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---