summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-08-31 13:50:06 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-08-31 13:50:06 +0000
commitf9b62b89a60793a12092ae5f3c3cef231c6aa03e (patch)
treec2927808469bbc6754154285e516e98624d12c0c
parenta5937e5c4590e806832d880b132c7b364b03e3cc (diff)
downloadabuild-f9b62b89a60793a12092ae5f3c3cef231c6aa03e.tar.bz2
abuild-f9b62b89a60793a12092ae5f3c3cef231c6aa03e.tar.xz
abuild: automatically add libgcc to depends when libpthread is found
see http://redmine.alpinelinux.org/issues/409
-rwxr-xr-xabuild.in10
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