Date: Tue, 2 Feb 2016 15:39:07 +0100
From: Natanael Copa <ncopa@alpinelinux.org>
To: Valery Kartel <valery.kartel@gmail.com>
Cc: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH] main/rrdtool: [V2] upgrade to 1.5.5,
 fix makedepends, split to subpackages, remove patches
Message-ID: <20160202153907.76279b47@ncopa-desktop.alpinelinux.org>
In-Reply-To: <1453802141-25460-1-git-send-email-valery.kartel@gmail.com>
References: <1453802141-25460-1-git-send-email-valery.kartel@gmail.com>
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Tue, 26 Jan 2016 11:55:41 +0200
Valery Kartel <valery.kartel@gmail.com> wrote:

> - remove all unneeded patches
> - add libxml2-dev to makedepends
> - rrdtool library moved to librrd subpackage
> - rrdtool_th threaded library moved to librrd-th subpackage
> - rrdcgi web-page template parser moved to -cgi subpackage
> - rrdcached daemon moved to -cached subpackage with init script and needed folders created
> - standalone utilities (rrdcreate,rrdupdate,rrdinfo) are moved to -utils subpackage
> ---
>  main/rrdtool/APKBUILD                 | 79 ++++++++++++++++++++++++-----------
>  main/rrdtool/libm-underlinking.patch  | 11 -----
>  main/rrdtool/lua-install-cmod.patch   | 13 ------
>  main/rrdtool/no-posix-fallocate.patch | 12 ------
>  main/rrdtool/rrdcached.initd          | 17 ++++++++
>  5 files changed, 72 insertions(+), 60 deletions(-)
>  delete mode 100644 main/rrdtool/libm-underlinking.patch
>  delete mode 100644 main/rrdtool/lua-install-cmod.patch
>  delete mode 100644 main/rrdtool/no-posix-fallocate.patch
>  create mode 100644 main/rrdtool/rrdcached.initd
> 
> diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
> index 7fa5287..c1d468c 100644
> --- a/main/rrdtool/APKBUILD
> +++ b/main/rrdtool/APKBUILD
> @@ -1,24 +1,23 @@
> +# Contributor: Valery Kartel <valery.kartel@gmail.com>
>  # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>  pkgname=rrdtool
> -pkgver=1.5.4
> +pkgver=1.5.5
>  pkgrel=0
>  pkgdesc="Data logging and graphing application"
>  url="http://www.rrdtool.org"
>  arch="all"
>  license="GPL"
> -depends="font-sony-misc"
> -makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev
> -	pango-dev lua lua-dev python-dev groff
> -	autoconf automake libtool"
> -subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd lua-rrd:lua_rrd py-rrd:py_rrd"
> +depends=

Is font-sony-misc no longer needed?
https://bugs.alpinelinux.org/issues/1475


> +depends_dev=
> +makedepends="$depends_dev groff autoconf automake libtool libart-lgpl-dev libpng-dev freetype-dev
> +	perl-dev cairo-dev libxml2-dev pango-dev lua-dev python-dev"
> +subpackages="$pkgname-doc $pkgname-dev $pkgname-cached $pkgname-cgi $pkgname-utils
> +	 perl-rrd:perl_rrd lua-rrd:lua_rrd py-rrd:py_rrd librrd-th:libth librrd:libs"
>  source="http://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz
> -	lua-install-cmod.patch
> -	libm-underlinking.patch
> -	no-posix-fallocate.patch
> +	rrdcached.initd
>  	"
>  
>  _builddir="$srcdir"/$pkgname-$pkgver
> -
>  prepare() {
>  	cd "$_builddir"
>  	for i in $source; do
> @@ -42,6 +41,7 @@ build() {
>  		--enable-perl-site-install \
>  		--enable-lua-site-install \
>  		--with-perl-options="INSTALLDIRS=vendor" \
> +		--with-pic \

why is --with-pic needed? if gcc does not by default build with pic
then please report it as a bug.

>  		|| return 1
>  	make || return 1 
>  }
> @@ -52,12 +52,37 @@ package() {
>  	make DESTDIR="$pkgdir" install || return 1
>  	find "$pkgdir" -name '.packlist' -delete
>  	find "$pkgdir" -name 'perllocal.pod' -delete
> +	rm "$pkgdir"/usr/lib/*.la

I think recent abuild does this automatically for you.

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---