diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-08-31 09:25:16 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-08-31 09:25:16 +0000 |
| commit | ff77079ba27c2375f9b1b7a68722a877185641ac (patch) | |
| tree | de5bc33c4f88ccafdf553c57c96b270f84912f33 /main | |
| parent | c110ba78ff68f63dd35d6bdbd4c2423d1ff3bcbd (diff) | |
| download | aports-ff77079ba27c2375f9b1b7a68722a877185641ac.tar.bz2 aports-ff77079ba27c2375f9b1b7a68722a877185641ac.tar.xz | |
main/abuild: fix for recursive building of versioned deps
Diffstat (limited to 'main')
| -rw-r--r-- | main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch | 29 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 7 |
2 files changed, 34 insertions, 2 deletions
diff --git a/main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch b/main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch new file mode 100644 index 0000000000..4ca284d00a --- /dev/null +++ b/main/abuild/0001-abuild-strip-versions-from-dependencies-when-buildin.patch @@ -0,0 +1,29 @@ +From f24e997104849f4a7cf9e2f73a3cc66a83624fcb Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 31 Aug 2009 09:12:04 +0000 +Subject: [PATCH] abuild: strip versions from dependencies when building recursively + +--- + abuild.in | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/abuild.in b/abuild.in +index b718a67..23c9f96 100755 +--- a/abuild.in ++++ b/abuild.in +@@ -712,7 +712,11 @@ depparse_aports() { + } + + deptrace() { +- local deps="$@" ++ local deps= i= ++ # strip versions from deps ++ for i in "$@"; do ++ deps="$deps ${i%[<>=]*}" ++ done + [ -z "$deps" ] && return 0 + ( depparse_aports + if [ -z "$upgrade" ]; then +-- +1.6.4 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index c3da3cb56c..108bab1ddf 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,9 +2,10 @@ pkgdesc="Script to build Alpine Packages" pkgname=abuild pkgver=2.0_rc8 -pkgrel=0 +pkgrel=1 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 + 0001-abuild-strip-versions-from-dependencies-when-buildin.patch " depends="fakeroot file sudo pax-utils openssl apk-tools" makedepends="openssl-dev pkgconfig" @@ -12,9 +13,11 @@ license=GPL-2 build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i ../0001-abuild-strip-versions-from-dependencies-when-buildin.patch || return 1 make install DESTDIR="$pkgdir" install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="869b37120781d7295a5fdea783086d8b abuild-2.0_rc8.tar.bz2" +md5sums="869b37120781d7295a5fdea783086d8b abuild-2.0_rc8.tar.bz2 +60d2a6c0b7b3a33ed4adf3c7154e5c01 0001-abuild-strip-versions-from-dependencies-when-buildin.patch" |