diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-11-07 15:48:29 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-11-07 16:12:10 +0000 |
| commit | 7d97401cb169b7c5ddb84ce70f3900b35310ee3d (patch) | |
| tree | e6deea67b9c96c32ceb04aeb7db99313d57a1b11 /main/abuild | |
| parent | ae3440587cb98f86e31b8f35818206c0a4eca48a (diff) | |
| download | aports-7d97401cb169b7c5ddb84ce70f3900b35310ee3d.tar.bz2 aports-7d97401cb169b7c5ddb84ce70f3900b35310ee3d.tar.xz | |
main/abuild: upgrade to 3.5.0_rc1
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-make-default_static-depend-on-depends_static.patch | 40 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 8 |
2 files changed, 3 insertions, 45 deletions
diff --git a/main/abuild/0001-make-default_static-depend-on-depends_static.patch b/main/abuild/0001-make-default_static-depend-on-depends_static.patch deleted file mode 100644 index b7851bcb06..0000000000 --- a/main/abuild/0001-make-default_static-depend-on-depends_static.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 68a054e274cb7661fc354de62d1ba8d53f2cea02 Mon Sep 17 00:00:00 2001 -From: Leo <thinkabit.ukim@gmail.com> -Date: Tue, 7 May 2019 02:09:39 -0300 -Subject: [PATCH] make default_static depend on depends_static - -keeps it in line with other default_ functions. ---- - APKBUILD.5 | 2 ++ - abuild.in | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/APKBUILD.5 b/APKBUILD.5 -index fe0f833..49b917e 100644 ---- a/APKBUILD.5 -+++ b/APKBUILD.5 -@@ -410,6 +410,8 @@ Specifies the run-time dependencies of the -doc subpackage. - Specifies the run-time dependencies of the -libs subpackage. - .It Cm depends_openrc - Specifies the run-time dependencies of the -openrc subpackage. -+.It Cm depends_static -+Specifies the run-time dependencies of the -static subpackage. - .It Cm giturl - Specifies the URL of the Git repository to use with - .Cm abuild checkout . -diff --git a/abuild.in b/abuild.in -index 08fce58..1b51e13 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -1747,7 +1747,7 @@ dev() { - # predefined splitfunc static - default_static() { - local i= -- depends="" -+ depends="$depends_static" - pkgdesc="$pkgdesc (static library)" - - cd "$pkgdir" || return 0 --- -2.22.0 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index f8e0de09be..75f73ef5f0 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abuild -pkgver=3.4.0 +pkgver=3.5.0_rc1 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=0 pkgdesc="Script to build Alpine Packages" url="https://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="https://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz - 0001-make-default_static-depend-on-depends_static.patch " builddir="$srcdir/$pkgname-$_ver" @@ -69,5 +68,4 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="0ddf1cef2e79628a4de06015ba217432711ee76751ccc487fd3b1af9cae37ed1b8c5afdc0b916322472314ccee8a6d1c17ccb5b55f6eebfb54444199d2281d3e abuild-3.4.0.tar.xz -bb0a550fe2742d93e49138a2909dc6ba0bf3ad598f87659cc1e10a4e78b8e8b32e8621365ba093210a1a00e6e0db45b27e756ba718c6bbcf27ce4abaa3898a08 0001-make-default_static-depend-on-depends_static.patch" +sha512sums="489198056857246adc7f61ca65e32d62717e872e11e284b83045f66a7b9b026cc6eb8d29215d94cee50a755f3320c1e8c51eca9a9763bd81da985b2f0713e4ee abuild-3.5.0_rc1.tar.xz" |