oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: automatically add libgcc to depends when libpthread is found

Browse Source 
see http://redmine.alpinelinux.org/issues/409
This commit is contained in:
Natanael Copa 2010-08-31 13:50:06 +00:00
parent a5937e5c45
commit f9b62b89a6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
abuild.in
View File

@ -483,7 +483,14 @@ trace_apk_deps() {
if [ -d "$pkgbasedir"/$name/usr/lib/pkgconfig ] \ if [ -d "$pkgbasedir"/$name/usr/lib/pkgconfig ] \
&& ! grep -q '^depend = pkgconfig' "$dir"/.PKGINFO; then && ! grep -q '^depend = pkgconfig' "$dir"/.PKGINFO; then
msg "Added pkgconfig as dependency" 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 fi
for i in $(cat "$dir"/.needs-so 2>/dev/null); do for i in $(cat "$dir"/.needs-so 2>/dev/null); do
found= found=
@ -509,6 +516,7 @@ trace_apk_deps() {
list_has "$found" $autodeps || autodeps="$autodeps $found" list_has "$found" $autodeps || autodeps="$autodeps $found"
msg "Added '$found' as dependency as it has $i" msg "Added '$found' as dependency as it has $i"
done done
[ -z "$autodeps" ] && return 0 [ -z "$autodeps" ] && return 0
echo "# automatically detected:" >> "$dir"/.PKGINFO echo "# automatically detected:" >> "$dir"/.PKGINFO
for i in $autodeps; do for i in $autodeps; do