abuild: fix detection of pkgconfig dependency
This commit is contained in:
parent
4e633c5be2
commit
9400ec0152
12
abuild.in
12
abuild.in
|
@ -426,6 +426,12 @@ trace_apk_deps() {
|
||||||
local dir="$2"
|
local dir="$2"
|
||||||
local i j found autodeps=
|
local i j found autodeps=
|
||||||
msg "Tracing dependencies for $name..."
|
msg "Tracing dependencies for $name..."
|
||||||
|
# add pkgconfig if usr/lib/pkgconfig is found
|
||||||
|
if [ -d "$pkgbasedir"/$name/usr/lib/pkgconfig ] \
|
||||||
|
&& ! grep -q '^depend = pkgconfig' "$dir"/.PKGINFO; then
|
||||||
|
msg "Added pkgconfig as dependency"
|
||||||
|
echo "depend = pkgconfig" >> "$dir"/.PKGINFO
|
||||||
|
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=
|
||||||
# first check if its provide by same apkbuild
|
# first check if its provide by same apkbuild
|
||||||
|
@ -455,12 +461,6 @@ trace_apk_deps() {
|
||||||
for i in $autodeps; do
|
for i in $autodeps; do
|
||||||
echo "depend = $i" >> "$dir"/.PKGINFO
|
echo "depend = $i" >> "$dir"/.PKGINFO
|
||||||
done
|
done
|
||||||
# add pkgconfig if usr/lib/pkgconfig is found
|
|
||||||
if [ -d "$pkgbasdir"/$name/usr/lib/pkgconfig ] \
|
|
||||||
&& ! grep -q '^depend = pkgconfig' "$dir"/.PKGINFO; then
|
|
||||||
msg "Added pkgconfig as dependency"
|
|
||||||
echo "depend = pkgconfig" >> "$dir"/.PKGINFO
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
create_apks() {
|
create_apks() {
|
||||||
|
|
Loading…
Reference in New Issue