aboutsummaryrefslogtreecommitdiffstats
path: root/main/abuild
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-01-14 15:52:54 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-01-14 15:54:24 +0000
commitf78eb58aad3e502e8346c6f6660370d0850cb848 (patch)
tree3e5ec7e2eef1d7e130d28b6e94157b879f8bef37 /main/abuild
parente9c1d055899696d1960fe9239d2926bd30733722 (diff)
downloadaports-f78eb58aad3e502e8346c6f6660370d0850cb848.tar.bz2
aports-f78eb58aad3e502e8346c6f6660370d0850cb848.tar.xz
main/abuild: fix move of .a files to -dev subpkg
Diffstat (limited to 'main/abuild')
-rw-r--r--main/abuild/0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch36
-rw-r--r--main/abuild/APKBUILD12
2 files changed, 44 insertions, 4 deletions
diff --git a/main/abuild/0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch b/main/abuild/0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch
new file mode 100644
index 0000000000..c87c83d0be
--- /dev/null
+++ b/main/abuild/0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch
@@ -0,0 +1,36 @@
+From a6150cc7e064f009537e4a3a444a9eb83c667113 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 14 Jan 2015 15:26:58 +0000
+Subject: [PATCH] abuild: fix move of .a file to -dev subpackage
+
+seems like new version of busybox find would stop if lib/ dir does not
+exist.
+---
+ abuild.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/abuild.in b/abuild.in
+index e4e5091..68f6afd 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -1294,6 +1294,8 @@ default_dev() {
+ done
+
+ cd "$pkgdir" || return 0
++ local libdirs=usr/
++ [ -d lib/ ] && libdirs="lib/ $libdirs"
+ for i in usr/include usr/lib/pkgconfig usr/share/aclocal\
+ usr/share/gettext usr/bin/*-config \
+ usr/share/vala/vapi usr/share/gir-[0-9]*\
+@@ -1301,7 +1303,7 @@ default_dev() {
+ usr/lib/qt*/mkspecs \
+ usr/lib/cmake \
+ $(find . -name include -type d) \
+- $(find lib/ usr/ -name '*.[acho]' \
++ $(find $libdirs -name '*.[acho]' \
+ -o -name '*.prl' 2>/dev/null); do
+ if [ -e "$pkgdir/$i" ] || [ -L "$pkgdir/$i" ]; then
+ d="$subpkgdir/${i%/*}" # dirname $i
+--
+2.2.2
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 9a1620138d..376d73bf4f 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=2.21.0
_ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
pkgdesc="Script to build Alpine Packages"
url="http://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -19,6 +19,7 @@ subpackages="apkbuild-cpan:cpan"
options="suid"
pkggroups="abuild"
source="http://dev.alpinelinux.org/archive/abuild/abuild-$pkgver.tar.xz
+ 0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch
"
_builddir="$srcdir/$pkgname-$_ver"
@@ -57,6 +58,9 @@ cpan() {
mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
}
-md5sums="126cbde6e4fdf537571a03a97d01d348 abuild-2.21.0.tar.xz"
-sha256sums="08689cbf8818c81d9e52e3397529adcb0e279a21d33dfe4f0678d0ef778767f3 abuild-2.21.0.tar.xz"
-sha512sums="b304dbb82563ec8ae23376c17ee27b3d49e9c1b74bd14b7a912ca88239ed3c7b2fabeb6209a6d4485c6dbab8491abb8b42f801f5fd9310691da60e630061646b abuild-2.21.0.tar.xz"
+md5sums="126cbde6e4fdf537571a03a97d01d348 abuild-2.21.0.tar.xz
+eea48116812c648c3b16acfe2f027b15 0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch"
+sha256sums="08689cbf8818c81d9e52e3397529adcb0e279a21d33dfe4f0678d0ef778767f3 abuild-2.21.0.tar.xz
+6c0fbe9c4e3b8d85723d4ff8e1338ae5fc789af2607fe089ae979df462b40e31 0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch"
+sha512sums="b304dbb82563ec8ae23376c17ee27b3d49e9c1b74bd14b7a912ca88239ed3c7b2fabeb6209a6d4485c6dbab8491abb8b42f801f5fd9310691da60e630061646b abuild-2.21.0.tar.xz
+3693b28a030c4d97fa0927ab5ac517176b9f9ad34b6c018bd77be8355f1127e09751edf5c3b30299427bb8e6afa0f8149da2cdd6d3c191fabc8f94886fa5b172 0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch"