mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2025-01-13 18:50:31 +00:00
abuild: add pkgconfig to depends if needed. misc fixes
This commit is contained in:
parent
53b17143d2
commit
28b7f5d2b1
20
abuild.in
20
abuild.in
@ -427,6 +427,12 @@ trace_apk_deps() {
|
||||
for i in $autodeps; do
|
||||
echo "depend = $i" >> "$dir"/.PKGINFO
|
||||
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() {
|
||||
@ -443,7 +449,12 @@ create_apks() {
|
||||
(
|
||||
cd "$datadir"
|
||||
# data.tar.gz
|
||||
tar -c . | abuild-tar --hash | gzip -9 >"$dir"/data.tar.gz
|
||||
set -- *
|
||||
if [ "$1" = '*' ]; then
|
||||
touch .dummy
|
||||
set -- .dummy
|
||||
fi
|
||||
tar -c "$@" | abuild-tar --hash | gzip -9 >"$dir"/data.tar.gz
|
||||
|
||||
# append the hash for data.tar.gz
|
||||
local sha256=$(sha256sum "$dir"/data.tar.gz | cut -f1 -d' ')
|
||||
@ -727,6 +738,13 @@ builddeps() {
|
||||
fi
|
||||
|
||||
[ -z "$recursive" ] && return 1
|
||||
|
||||
# find dependencies that are installed but missing in repo.
|
||||
for i in $deps; do
|
||||
if [ -z "$(apk search --repo "$apkcache" $i)" ]; then
|
||||
missing="$missing $i"
|
||||
fi
|
||||
done
|
||||
|
||||
for i in $(deptrace $missing); do
|
||||
# i = pkg:dir
|
||||
|
Loading…
Reference in New Issue
Block a user