X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 4E199DC0214 for ; Thu, 21 Jan 2016 07:25:26 +0000 (UTC) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com [209.85.217.175]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id DE49ADC017A for ; Thu, 21 Jan 2016 07:25:25 +0000 (UTC) Received: by mail-lb0-f175.google.com with SMTP id cl12so18228529lbc.1 for ; Wed, 20 Jan 2016 23:25:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=UvdQbt84ZZM/CiCtinFAk//gwC5YAgFvnFqIHVY6ZoA=; b=dzJ8IMuaQs2FSW8oX1yAgrzBq/x5xvT1yWGaNAYlMzOhXcYeGTxrH+7CVDAqBr4GKo x61SoWHUB4slHUovQyzlWCon18T1+qmn+wA1pZmJNSrZwK7eeArDXkB4T9K/+jdF3FyX RWfUNRrWCzqSulsCk6PupetzEd2D6ieNchpRv4lvsBhJq2dZZfAu0BOLhS8cuD3GWhH8 GvE5vCgPEgVQv/vgtNfDm4+TJtqwBuSLx007z84bTL0JCzvc/pZf49MQDKpicp33ZY2M PzqB17kbjCvo2OQ//m3DpvxFIB4l8Du7gipssHGTs7BuYg5Qx8CjJ1DAerFJwKVPqUM+ 5WRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=UvdQbt84ZZM/CiCtinFAk//gwC5YAgFvnFqIHVY6ZoA=; b=OXezK00v8U67RKn0PZ3ZYAfPiyOUtFuEb2+Z4whoGhkXcdb3qwoHHD2CBxQ1ESiNry vwVlla772zfehM0Quc9DwKonAFhQnSK8BFhuDDCvAVoLf35VDPxuI8KY4cB7/LDjVvkc Zn/+OtoSiGYczLkZT+tutZrqP/qtMghulzc1rjPBx9pPEwxFMZpWlotuhDC/qVJwaxQR W2dvulr4ofpbVcMMke1csMPrdRc4nXhZm00yMl+4XwIDge3z/wzhkZ4ifCz+J8or9hjs TEXqi3t9lD5m7LgbDlB0z+NVE8U3amMAJtJRxCCWXb0O3lEg/UI+ofcLhFiZy8t4YEB1 8gjQ== X-Gm-Message-State: ALoCoQmbO9hPJ/7y+THn1dS2vKgNFDKC5RjCtWrDYRvn/8c/iCkg48bVNPpTLZFsnT+BDBhHx1AkoZhiPrzo5XIKx7gKblJtIw== X-Received: by 10.112.156.6 with SMTP id wa6mr14527904lbb.66.1453361124089; Wed, 20 Jan 2016 23:25:24 -0800 (PST) Received: from vostro ([2001:1bc8:101:f402:21a:9fff:fe0c:4022]) by smtp.gmail.com with ESMTPSA id r202sm1005lfr.43.2016.01.20.23.25.23 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jan 2016 23:25:23 -0800 (PST) Sender: =?UTF-8?Q?Timo_Ter=C3=A4s?= Date: Thu, 21 Jan 2016 09:25:21 +0200 From: Timo Teras To: Valery Kartel Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] main/file: libmagic library moved to separate subpackage. minor APKBUILD cleanups Message-ID: <20160121092521.48af45c1@vostro> In-Reply-To: References: <1453303190-30557-1-git-send-email-valery.kartel@gmail.com> <20160121084008.19689e2c@vostro> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.28; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Virus-Scanned: ClamAV using ClamSMTP On Thu, 21 Jan 2016 09:23:44 +0200 Valery Kartel wrote: > I remove --build & --host because ./configure knows nothing about > linux-musl system type. > > I just made a patch, which follows the previous, that fix it. Please fold them together. If configure knows nothing about them, keep the update_config_sub script in prepare(). It makes the autotools know about it :) Thanks, Timo > 21 =D1=81=D1=96=D1=87. 2016 08:40 "Timo Teras" =D0=BF= =D0=B8=D1=88=D0=B5: >=20 > > On Wed, 20 Jan 2016 17:19:50 +0200 > > Valery Kartel wrote: > > =20 > > > --- > > > main/file/APKBUILD | 28 ++++++++++++---------------- > > > 1 file changed, 12 insertions(+), 16 deletions(-) =20 > > > > Looks mostly good. There's one comment inline that needs changing. > > > > Additionally, could you format the commit message so that the > > first line of the commit message is a concise abbreviation, and > > the explanation goes on lines 3+. > > > > So for example on this commit, just: > > > > main/file: split libmagic and cleanups > > > > ... would be sufficient. We usually don't use dots on the first > > line. > > > > The main reason is that 'git shortlog' will show only the first > > line, and it should not be too long. 'git log' will show the full > > commit log and e.g. cgit formats it so that the first line is in > > bold, the line 2 is expected empty, and line 3+ is plain text. > > > > Thanks. > > > > =20 > > > diff --git a/main/file/APKBUILD b/main/file/APKBUILD > > > index ceff2e6..6fdc2e5 100644 > > > --- a/main/file/APKBUILD > > > +++ b/main/file/APKBUILD > > > @@ -1,32 +1,22 @@ > > > +# Contributor: Valery Kartel > > > # Maintainer: Natanael Copa > > > pkgname=3Dfile > > > pkgver=3D5.25 > > > -pkgrel=3D0 > > > +pkgrel=3D1 > > > pkgdesc=3D"File type identification utility" > > > url=3D"http://www.darwinsys.com/file/" > > > arch=3D"all" > > > license=3D"BSD" > > > depends=3D"" > > > -source=3D"ftp://ftp.astron.com/pub/file/file-$pkgver.tar.gz > > > - " > > > -subpackages=3D"$pkgname-dev $pkgname-doc" > > > +source=3D"ftp://ftp.astron.com/pub/file/file-$pkgver.tar.gz" > > > > > > -_builddir=3D"$srcdir/$pkgname-$pkgver" > > > -prepare() { > > > - cd "$_builddir" > > > - update_config_sub || return 1 > > > - for i in $source; do > > > - case $i in > > > - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return > > > 1;; > > > - esac > > > - done > > > -} > > > +subpackages=3D"$pkgname-dev $pkgname-doc libmagic" > > > + > > > +_builddir=3D"$srcdir"/$pkgname-$pkgver > > > > > > build() { > > > cd "$_builddir" > > > ./configure \ > > > - --build=3D$CBUILD \ > > > - --host=3D$CHOST \ =20 > > > > Please don't remove --build and --host. They are needed for > > bootstrapping new architectures. And if and when we want to support > > cross-building. > > =20 > > > --prefix=3D/usr \ > > > --datadir=3D/usr/share \ > > > || return 1 > > > @@ -39,6 +29,12 @@ package() { > > > make DESTDIR=3D"$pkgdir" install || return 1 > > > } > > > > > > +libmagic() { > > > + pkgdesc=3D"File type identification library" > > > + mkdir -p "$subpkgdir"/usr > > > + mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr > > > +} > > > + > > > md5sums=3D"e6a972d4e10d9e76407a432f4a63cd4c file-5.25.tar.gz" > > > =20 > > sha256sums=3D"3735381563f69fb4239470b8c51b876a80425348b8285a7cded8b61d6= b890eca =20 > > > file-5.25.tar.gz" > > > =20 > > sha512sums=3D"4a5176a7e80df2bb7e45916490433d22eb98a442d49d04146afcbdcf9= 2ff619ea3e73e95c8991e6b6a0628efb9d127bfa4aafc1cae523f8261ca693bc5e13402 =20 > > > file-5.25.tar.gz" =20 > > > > =20 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---