diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-07-29 20:18:20 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-07-29 20:18:20 +0000 |
| commit | f841ddd01a35ee689ea10047d0adef06510e21b6 (patch) | |
| tree | 17b33480705bfc5c37452127be9a2392ce938f40 /main | |
| parent | 777121abd9daf4e8c9c8f9295e0fe85214683517 (diff) | |
| download | aports-fcolista-f841ddd01a35ee689ea10047d0adef06510e21b6.tar.bz2 aports-fcolista-f841ddd01a35ee689ea10047d0adef06510e21b6.tar.xz | |
main/abuild: fix for dynamic deps
fixes #100
Diffstat (limited to 'main')
| -rw-r--r-- | main/abuild/APKBUILD | 7 | ||||
| -rw-r--r-- | main/abuild/dynamic-deps-fix.patch | 13 |
2 files changed, 18 insertions, 2 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 4b5ef569bd..a6b52e65a2 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,9 +2,10 @@ pkgdesc="Script to build Alpine Packages" pkgname=abuild pkgver=2.0_rc3 -pkgrel=0 +pkgrel=1 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 + dynamic-deps-fix.patch " depends="fakeroot file sudo pax-utils openssl apk-tools" makedepends="openssl-dev" @@ -12,9 +13,11 @@ license=GPL-2 build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 < ../dynamic-deps-fix.patch || return 1 make install DESTDIR="$pkgdir" install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="e9ff5f028c69b1cb1e3a6c2fbd6e43a9 abuild-2.0_rc3.tar.bz2" +md5sums="e9ff5f028c69b1cb1e3a6c2fbd6e43a9 abuild-2.0_rc3.tar.bz2 +3ab5ff884b5a52a4870df9604e3adef8 dynamic-deps-fix.patch" diff --git a/main/abuild/dynamic-deps-fix.patch b/main/abuild/dynamic-deps-fix.patch new file mode 100644 index 0000000000..df89cc6ae0 --- /dev/null +++ b/main/abuild/dynamic-deps-fix.patch @@ -0,0 +1,13 @@ +diff --git a/abuild.in b/abuild.in +index a121dc5..bf3f505 100755 +--- a/abuild.in ++++ b/abuild.in +@@ -415,7 +415,7 @@ trace_apk_deps() { + error "Could not find dependency for $i" + return 1 + fi +- if grep -w "^depend = $found" "$dir"/.PKGINFO >/dev/null ; then ++ if grep -w "^depend = ${found}$" "$dir"/.PKGINFO >/dev/null ; then + warning "You can remove '$found' from depends" + continue + fi |