summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-06-04 11:50:41 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-06-04 11:50:41 +0000
commite59de7c8a25ba3f26501a5f3be54ba464b0ff3f4 (patch)
tree3681112dfa303c841dc952edccce0bfd943e4cd1
parentfddc01bbbbe61ea81f4e582bcfbd1ec1f955f8c5 (diff)
downloadabuild-e59de7c8a25ba3f26501a5f3be54ba464b0ff3f4.tar.bz2
abuild-e59de7c8a25ba3f26501a5f3be54ba464b0ff3f4.tar.xz
abuild: fix detection of symlink dependencies
- add as dep when the target is also a symlink - fix handling of absolute path in target
-rw-r--r--abuild.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/abuild.in b/abuild.in
index cb5d286..3879b5e 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1176,12 +1176,16 @@ scan_shared_objects() {
# find which package provides file that symlink points to
scan_symlink_targets() {
local name="$1" dir="$2" datadir="$3"
- local symfile
+ local symfile= targetpath=
cd "$datadir"
for symfile in "$pkgbasedir"/.control.*/.symlinks; do
[ -e "$symfile" ] || continue
while read symlink target; do
- if [ -e "${symlink%/*}"/"$target" ]; then
+ case "$target" in
+ /*) targetpath="${datadir}/$target";;
+ *) targetpath="${symlink%/*}/$target";;
+ esac
+ if [ -e "$targetpath" ] || [ -L "$targetpath" ]; then
local d="${symfile%/.symlinks}"
echo "$name=$pkgver-r$pkgrel" \
>> "$d"/.symlinks-needs