diff options
Diffstat (limited to 'main/abuild/0001-abuild-fix-circular-dependency-for-symlink-deps.patch')
| -rw-r--r-- | main/abuild/0001-abuild-fix-circular-dependency-for-symlink-deps.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/main/abuild/0001-abuild-fix-circular-dependency-for-symlink-deps.patch b/main/abuild/0001-abuild-fix-circular-dependency-for-symlink-deps.patch new file mode 100644 index 0000000000..c658262d36 --- /dev/null +++ b/main/abuild/0001-abuild-fix-circular-dependency-for-symlink-deps.patch @@ -0,0 +1,37 @@ +From 3f3281c87e123d15284e07e80a6ab5ba751463c9 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 23 Jun 2015 11:20:29 +0000 +Subject: [PATCH] abuild: fix circular dependency for symlink deps + +The package should not have itself as dependency. +--- + abuild.in | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/abuild.in b/abuild.in +index 0813dd3..e76d873 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1210,14 +1210,17 @@ scan_symlink_targets() { + local symfile= targetpath= + cd "$datadir" + for symfile in "$pkgbasedir"/.control.*/.symlinks; do +- [ -e "$symfile" ] || continue ++ local d="${symfile%/.symlinks}" ++ if ! [ -e "$symfile" ] || [ "$d" = "$dir" ]; then ++ continue ++ fi ++ + while read symlink target; do + if [ "${target#/}" = "$target" ]; then + target="${symlink%/*}/$target" + fi + targetpath="$datadir"/$(normalize_path "$target") + if [ -e "$targetpath" ] || [ -L "$targetpath" ]; then +- local d="${symfile%/.symlinks}" + echo "$name=$pkgver-r$pkgrel" \ + >> "$d"/.symlinks-needs + fi +-- +2.4.4 + |