main/abuild: upgrade to 2.27.1

This commit is contained in:
Natanael Copa 2016-05-16 13:29:42 +00:00
parent 9be2f74df2
commit db00ceb9ee
2 changed files with 5 additions and 49 deletions

View File

@ -1,40 +0,0 @@
From d413730550eb1d6fa28be5b48778f156c504d75d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 5 Apr 2016 20:35:34 +0000
Subject: [PATCH] abuild: don't cd to $builddir unless patches exists
some packages don't have patches. We should not error if builddir is not
set in this case.
---
abuild.in | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/abuild.in b/abuild.in
index ac43a11..d6cdf6c 100644
--- a/abuild.in
+++ b/abuild.in
@@ -530,8 +530,21 @@ getpkgver() {
fi
}
+have_patches() {
+ local i
+ for i in $source; do
+ case "$i" in
+ *.patch) return 0;;
+ esac
+ done
+ return 1
+}
+
default_prepare() {
local i
+ if ! have_patches; then
+ return 0
+ fi
cd "${builddir:-$srcdir/$pkgname-$pkgver}" \
|| { error "Is \$builddir set correctly?"; return 1; }
for i in $source; do
--
2.8.0

View File

@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
pkgver=2.27.0
pkgver=2.27.1
_ver=${pkgver%_git*}
pkgrel=2
pkgrel=0
pkgdesc="Script to build Alpine Packages"
url="http://git.alpinelinux.org/cgit/abuild/"
arch="all"
@ -20,7 +20,6 @@ subpackages="apkbuild-cpan:cpan apkbuild-gem-resolver:gems"
options="suid"
pkggroups="abuild"
source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
0001-abuild-don-t-cd-to-builddir-unless-patches-exists.patch
"
_builddir="$srcdir/$pkgname-$_ver"
@ -65,9 +64,6 @@ gems() {
mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/
}
md5sums="c67e4c971c54b4d550e16db3ba331f96 abuild-2.27.0.tar.xz
3ed285c19846a4f48883ffc02b534d33 0001-abuild-don-t-cd-to-builddir-unless-patches-exists.patch"
sha256sums="c8db017e3dd168edb20ceeb91971535cf66b8c95f29d3288f88ac755bffc60e5 abuild-2.27.0.tar.xz
ba429d632056f0d5bae97867e251eaa585aa8286e064682d47b2149aa273f52f 0001-abuild-don-t-cd-to-builddir-unless-patches-exists.patch"
sha512sums="98e1da4e47f3ab68700b3bc992c83e103f770f3196e433788ee74145f57cd33e5239c87f0a7a15f7266840d5bad893fc8c0d4c826d663df53deaee2678c56984 abuild-2.27.0.tar.xz
4e448ac42576764c8813ba2f83153b7029adbc462e59e35e22ddff204fc5f125860d0c7eb3cc9beda17624a6f93dd869c79a9c21368cf1366c308c655f793a8e 0001-abuild-don-t-cd-to-builddir-unless-patches-exists.patch"
md5sums="7fd3556f17d2ca1d663bdb8259ad1b13 abuild-2.27.1.tar.xz"
sha256sums="fe4edac6ab43de765d9efc009278247ecab0dab1177a61e174a7e427edb6c723 abuild-2.27.1.tar.xz"
sha512sums="9bad79a2a24f3df0ef7323f2c6fa8f597ebfd93b2cc1a156d559ccd69f0d94958ba3b76febcf553cdd0173bcdd5d8ddf6ab2eca03f5737a523aefc8e6809a9f9 abuild-2.27.1.tar.xz"