Commit fa97c553 authored by Natanael Copa's avatar Natanael Copa

main/abuild: upgrade to git snapshot 20150408

with xattr support for new paxmarking style
parent 05194ff1
From 756a9e0c0466e79d914e563068ed345f47a8092f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 28 Jan 2015 13:09:24 +0000
Subject: [PATCH] abuild: fix CXXFLAGS for debug
---
abuild.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/abuild.in b/abuild.in
index 68f6afd..655c1a9 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1995,6 +1995,7 @@ fi
# if we want build debug package
if [ -n "$DEBUG" ] || subpackage_types_has "dbg"; then
CFLAGS="$CFLAGS -g"
+ CXXFLAGS="$CXXFLAGS -g"
options="$options !strip"
fi
--
2.2.2
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
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
pkgver=2.21.0
pkgver=2.21.0_git20150408
_ver=${pkgver%_git*}
pkgrel=2
pkgrel=0
pkgdesc="Script to build Alpine Packages"
url="http://git.alpinelinux.org/cgit/abuild/"
arch="all"
license="GPL2"
depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils"
depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils
attr tar"
if [ "$CBUILD" = "$CHOST" ]; then
depends="$depends curl"
fi
......@@ -18,9 +19,8 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
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
0001-abuild-fix-CXXFLAGS-for-debug.patch
source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
git.patch
"
_builddir="$srcdir/$pkgname-$_ver"
......@@ -60,11 +60,8 @@ cpan() {
}
md5sums="126cbde6e4fdf537571a03a97d01d348 abuild-2.21.0.tar.xz
eea48116812c648c3b16acfe2f027b15 0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch
fa5de956ef50716388fed26dd8fc6c82 0001-abuild-fix-CXXFLAGS-for-debug.patch"
453ee698af510fc0cf10a33020e37e73 git.patch"
sha256sums="08689cbf8818c81d9e52e3397529adcb0e279a21d33dfe4f0678d0ef778767f3 abuild-2.21.0.tar.xz
6c0fbe9c4e3b8d85723d4ff8e1338ae5fc789af2607fe089ae979df462b40e31 0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch
e878f17f98c7e6ad43e20d069fc4a23a91086ff09fb6bb05f0b31c68b8ecf852 0001-abuild-fix-CXXFLAGS-for-debug.patch"
7e7f9a837c2c6a2bddb2db80f86b2cad212cbb0cc8f2a8b63534dd5a3bc52318 git.patch"
sha512sums="b304dbb82563ec8ae23376c17ee27b3d49e9c1b74bd14b7a912ca88239ed3c7b2fabeb6209a6d4485c6dbab8491abb8b42f801f5fd9310691da60e630061646b abuild-2.21.0.tar.xz
3693b28a030c4d97fa0927ab5ac517176b9f9ad34b6c018bd77be8355f1127e09751edf5c3b30299427bb8e6afa0f8149da2cdd6d3c191fabc8f94886fa5b172 0001-abuild-fix-move-of-.a-file-to-dev-subpackage.patch
19f77dd76909edceaf41b14a66ce46ee81e31654e07ccc935d3db0bf711ca4caae083d3fc5e3ccf44d58cce602923bcc3259364d4b811f6c288200531ebfd40c 0001-abuild-fix-CXXFLAGS-for-debug.patch"
6ab114cd383d29244124e5cf440ef17f292e01a683d21c153f808d7757e38e1b575384d5d4b2a3314c17a5656c64361703c3f746577266ae4403edcf353cc5e8 git.patch"
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment