diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-25 13:51:23 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-25 13:53:30 +0000 |
| commit | 890fbefc85019dbec252db067630ad0fbb8e0839 (patch) | |
| tree | 6ecfa1fa3269d25237f3d27aa01806e37fe322b9 /main/abuild | |
| parent | 23026ec23a0965984c4fdfd5a46b57d0d23b3b72 (diff) | |
| download | aports-890fbefc85019dbec252db067630ad0fbb8e0839.tar.bz2 aports-890fbefc85019dbec252db067630ad0fbb8e0839.tar.xz | |
main/abuild: upgrade to 3.1.0
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-log-command-providers.patch | 55 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 8 |
2 files changed, 3 insertions, 60 deletions
diff --git a/main/abuild/0001-abuild-log-command-providers.patch b/main/abuild/0001-abuild-log-command-providers.patch deleted file mode 100644 index a536b829bf..0000000000 --- a/main/abuild/0001-abuild-log-command-providers.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4dfc57946e7f1c97da41da64ec44d31d55fbfe3e Mon Sep 17 00:00:00 2001 -From: William Pitcock <nenolod@dereferenced.org> -Date: Fri, 20 Oct 2017 14:53:34 +0000 -Subject: [PATCH] abuild: log command: providers - ---- - abuild.in | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/abuild.in b/abuild.in -index 7f9818b..41b465d 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -1004,6 +1004,19 @@ prepare_pkgconfig_provides() { - done - } - -+prepare_command_provides() { -+ local dir="${subpkgdir:-$pkgdir}" -+ options_has "!tracedeps" && return 0 -+ cd "$dir" || return 1 -+ for i in bin/* sbin/* usr/bin/* usr/sbin/*; do -+ if ! [ -x "$i" ]; then -+ continue -+ fi -+ local f=${i##*/} -+ echo $f >> "$controldir"/.provides-command -+ done -+} -+ - # check if dir has arch specific binaries - dir_has_arch_binaries() { - local dir="$1" -@@ -1047,6 +1060,7 @@ prepare_package() { - && prepare_trace_rpaths \ - && prepare_symlinks \ - && prepare_pkgconfig_provides \ -+ && prepare_command_provides \ - || return 1 - archcheck - } -@@ -1184,6 +1198,10 @@ trace_apk_deps() { - sed 's/^/provides = pc:/' "$dir"/.provides-pc | sort -u \ - >> "$dir"/.PKGINFO - fi -+ if [ -f "$dir"/.provides-command ]; then -+ sed 's/^/provides = command:/' "$dir"/.provides-command | sort -u \ -+ >> "$dir"/.PKGINFO -+ fi - [ -z "$autodeps" ] && return 0 - for i in $autodeps; do - echo "depend = $i" --- -2.14.2 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 68150a2bdd..2d04d275ea 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abuild -pkgver=3.0.2 +pkgver=3.1.0 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=0 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -21,7 +21,6 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch options="suid !check" pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz - 0001-abuild-log-command-providers.patch " builddir="$srcdir/$pkgname-$_ver" @@ -68,5 +67,4 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="74b379e13be79987511ad3a610c40ac7767d26c61b3c235b3c9c2f3bf4ea2cb289b47ef35d8475cc1e3602f371a92fe23833a0f1a60f2e3d231a747a917e9987 abuild-3.0.2.tar.xz -3e1687da867fd17ba7ded08d947add1a0617744fffbfc978c2c4896e2b67c3309ed052c3313c85b3de4ca3857415f3416fa6b358e099d34f85f16ed0f2617d97 0001-abuild-log-command-providers.patch" +sha512sums="bb9093d67942e3a63e4e053692c0bca30940cae05955518206cd9f7029211a188b7f442456ae126e61cbdca224eddb31e967d5cf0637e16893163cc963871a52 abuild-3.1.0.tar.xz" |