diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/abuild/0001-abuild-do-not-install-itself-as-a-makedepend.patch | 49 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 12 |
2 files changed, 57 insertions, 4 deletions
diff --git a/main/abuild/0001-abuild-do-not-install-itself-as-a-makedepend.patch b/main/abuild/0001-abuild-do-not-install-itself-as-a-makedepend.patch new file mode 100644 index 0000000000..a93de8c30e --- /dev/null +++ b/main/abuild/0001-abuild-do-not-install-itself-as-a-makedepend.patch @@ -0,0 +1,49 @@ +From ef647cce7328b12c3f734f3ebd373bf577de27ca Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 29 Oct 2015 15:30:53 +0000 +Subject: [PATCH] abuild: do not install itself as a makedepend + +we might need add $pkgname as a dependency for $pkgname-dev and then we +should not install ourselves in case makedepends="$depends_dev" + +This is needed foor bootstraping. +--- + abuild.in | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/abuild.in b/abuild.in +index 0dd8f9a..e44696b 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1721,14 +1721,12 @@ builddeps() { + [ "$pkgname" = "${i%%[<>=]*}" ] && continue + subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" + done +- hostdeps="$makedepends_host" +- for i in $depends; do ++ for i in $depends $makedepends_host; do + [ "$pkgname" = "${i%%[<>=]*}" ] && continue + subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i" + done + else +- builddeps="$makedepends" +- for i in $BUILD_BASE $depends; do ++ for i in $BUILD_BASE $depends $makedepends; do + [ "$pkgname" = "${i%%[<>=]*}" ] && continue + subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" + done +@@ -1962,9 +1960,8 @@ post_add() { + } + + deps() { +- local builddeps i +- builddeps="$makedepends" +- for i in $depends; do ++ local builddeps= i ++ for i in $depends $makedepends; do + [ "$pkgname" = "${i%%[<>=]*}" ] && continue + subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" + done +-- +2.6.1 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index e89e6fabb5..c1aa017b7e 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.25.0_rc1 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -20,6 +20,7 @@ subpackages="apkbuild-cpan:cpan apkbuild-gem-resolver:gems" options="suid" pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz + 0001-abuild-do-not-install-itself-as-a-makedepend.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -64,6 +65,9 @@ gems() { mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/ } -md5sums="6fd1f7b99247618cbf0ca22b7c6cec1b abuild-2.25.0_rc1.tar.xz" -sha256sums="2addf0e0a518d85669f5a6cbe593ea7d57232d8573acd1a9e322b68e5a14614d abuild-2.25.0_rc1.tar.xz" -sha512sums="6dca86b68f57aaa4df0a1401098d2264d33c44380a0186ae3b03784e8f648ac17317d7ce7d3586db45d3d36ca65454fc53e032bd7b58f22f356c937038a991e5 abuild-2.25.0_rc1.tar.xz" +md5sums="6fd1f7b99247618cbf0ca22b7c6cec1b abuild-2.25.0_rc1.tar.xz +6bf3cbf4d6175798fff17baaa1ecef2c 0001-abuild-do-not-install-itself-as-a-makedepend.patch" +sha256sums="2addf0e0a518d85669f5a6cbe593ea7d57232d8573acd1a9e322b68e5a14614d abuild-2.25.0_rc1.tar.xz +007177afd724e8fdc081588079c8d70724b271686a0f2776ec831447aa115185 0001-abuild-do-not-install-itself-as-a-makedepend.patch" +sha512sums="6dca86b68f57aaa4df0a1401098d2264d33c44380a0186ae3b03784e8f648ac17317d7ce7d3586db45d3d36ca65454fc53e032bd7b58f22f356c937038a991e5 abuild-2.25.0_rc1.tar.xz +b15632f09015ed40639fcb3cba8253608a3637d3e103707a35d249ae4f2fe92a5ed77168146e8d7eccae7bec8cec17b58bce921119a7aa4911059cc3942a89a4 0001-abuild-do-not-install-itself-as-a-makedepend.patch" |