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