aboutsummaryrefslogtreecommitdiffstats
path: root/main/abuild
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-08-31 13:54:00 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-08-31 13:54:00 +0000
commitc76c734fc5f6e157d918e89a37d140f985c13996 (patch)
tree5b6576f42d47aac1113009b85e2705f87d93d10a /main/abuild
parent930dadc2e00d672f403b3a565d4f1bd3cb2663f2 (diff)
downloadaports-c76c734fc5f6e157d918e89a37d140f985c13996.tar.bz2
aports-c76c734fc5f6e157d918e89a37d140f985c13996.tar.xz
main/abuild: automatically add libcc to depends when libpthread is used
fixes #409
Diffstat (limited to 'main/abuild')
-rw-r--r--main/abuild/0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch41
-rw-r--r--main/abuild/APKBUILD6
2 files changed, 45 insertions, 2 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
new file mode 100644
index 0000000000..2b30a8f10e
--- /dev/null
+++ b/main/abuild/0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch
@@ -0,0 +1,41 @@
+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 f1d6b6cd8f..133aa34978 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,9 +2,10 @@
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
pkgver=2.5
-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-automatically-add-libgcc-to-depends-when-libp.patch
"
depends="fakeroot file sudo pax-utils openssl apk-tools"
makedepends="openssl-dev pkgconfig"
@@ -33,4 +34,5 @@ package() {
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
}
-md5sums="2173f4775cb2672661cfc3de55c8450e abuild-2.5.tar.bz2"
+md5sums="2173f4775cb2672661cfc3de55c8450e abuild-2.5.tar.bz2
+ce8a7d262d3a341faed0b67c5c894225 0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch"