diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/abuild/0001-abuild-log-command-providers.patch | 55 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 3 |
2 files changed, 57 insertions, 1 deletions
diff --git a/main/abuild/0001-abuild-log-command-providers.patch b/main/abuild/0001-abuild-log-command-providers.patch new file mode 100644 index 0000000000..a536b829bf --- /dev/null +++ b/main/abuild/0001-abuild-log-command-providers.patch @@ -0,0 +1,55 @@ +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 a88a162ef3..5f36d64a5c 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=3.0.2 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -21,6 +21,7 @@ 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" |