diff options
| -rw-r--r-- | main/abuild/0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch | 41 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 14 | ||||
| -rw-r--r-- | main/abuild/gawk.patch | 22 |
3 files changed, 5 insertions, 72 deletions
diff --git a/main/abuild/0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch b/main/abuild/0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch deleted file mode 100644 index 2b30a8f10..000000000 --- a/main/abuild/0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f9b62b89a60793a12092ae5f3c3cef231c6aa03e Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 31 Aug 2010 13:50:06 +0000 -Subject: [PATCH] abuild: automatically add libgcc to depends when libpthread is found - -see http://redmine.alpinelinux.org/issues/409 ---- - abuild.in | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/abuild.in b/abuild.in -index 24920d5..c01c9bf 100755 ---- a/abuild.in -+++ b/abuild.in -@@ -483,7 +483,14 @@ trace_apk_deps() { - if [ -d "$pkgbasedir"/$name/usr/lib/pkgconfig ] \ - && ! grep -q '^depend = pkgconfig' "$dir"/.PKGINFO; then - msg "Added pkgconfig as dependency" -- echo "depend = pkgconfig" >> "$dir"/.PKGINFO -+ autodeps="$autodeps pkgconfig" -+ fi -+ -+ # special case for libpthread: we need depend on libgcc -+ if grep -q -w '^libpthread.so.*' "$dir"/.needs-so 2>/dev/null \ -+ && ! grep -q -w "^depend = libgcc" "$dir"/.PKGINFO; then -+ autodeps="$autodeps libgcc" -+ msg "Added libgcc as dependency due to libpthread" - fi - for i in $(cat "$dir"/.needs-so 2>/dev/null); do - found= -@@ -509,6 +516,7 @@ trace_apk_deps() { - list_has "$found" $autodeps || autodeps="$autodeps $found" - msg "Added '$found' as dependency as it has $i" - done -+ - [ -z "$autodeps" ] && return 0 - echo "# automatically detected:" >> "$dir"/.PKGINFO - for i in $autodeps; do --- -1.7.2.2 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 62467672f..8d2610481 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,16 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.5 -pkgrel=2 +pkgver=2.6 +pkgrel=0 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 - 0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch - gawk.patch " -depends="fakeroot file sudo pax-utils openssl apk-tools" +depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1" makedepends="openssl-dev pkgconfig" -arch="x86 x86_64" +arch="all" license=GPL-2 prepare() { @@ -36,6 +34,4 @@ package() { install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf } -md5sums="2173f4775cb2672661cfc3de55c8450e abuild-2.5.tar.bz2 -ce8a7d262d3a341faed0b67c5c894225 0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch -7131a1eb6cbc03a2ec70da91be0d16c4 gawk.patch" +md5sums="63f10a6cafe1ede3b9f8808af006c3fd abuild-2.6.tar.bz2" diff --git a/main/abuild/gawk.patch b/main/abuild/gawk.patch deleted file mode 100644 index f0d0e2ed7..000000000 --- a/main/abuild/gawk.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a5937e5c4590e806832d880b132c7b364b03e3cc Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 27 Aug 2010 13:34:33 +0000 -Subject: abuild: support for alternative awks - -some awk's does not understand -F "\ " and treats that as special space ---- -diff --git a/abuild.in b/abuild.in -index fbfee57..24920d5 100755 ---- a/abuild.in -+++ b/abuild.in -@@ -453,7 +453,7 @@ prepare_tracedeps() { - options_has "!tracedeps" && return 0 - find -name '*.so' -o -name '*.so.[0-9]*' | sed 's:.*/::' \ - >"$controldir"/.provides-so -- scanelf -Rn "$dir" | awk -F "\ " '$1 == "ET_DYN" || $1 == "ET_EXEC" {print $2}' \ -+ scanelf -Rn "$dir" | tr ' ' ':' | awk -F ":" '$1 == "ET_DYN" || $1 == "ET_EXEC" {print $2}' \ - | sed 's:,:\n:g' | sort | uniq \ - | while read i; do - # only add files that are not self provided --- -cgit v0.8.3.1 |