diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-07-30 12:40:22 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-07-30 12:40:22 +0000 |
| commit | a4d45f7f15e6b92de57accd07cf20782ec8bdf7a (patch) | |
| tree | aa8b14c4fd6e802604082932d5afd6d5cf68e802 /main/abuild/0001-abuild-fix-ldpath-handling.patch | |
| parent | c212923f6229950a08dc95fcee417d69123b5ea8 (diff) | |
| download | aports-a4d45f7f15e6b92de57accd07cf20782ec8bdf7a.tar.bz2 aports-a4d45f7f15e6b92de57accd07cf20782ec8bdf7a.tar.xz | |
main/abuild: backport ldpath fix
Diffstat (limited to 'main/abuild/0001-abuild-fix-ldpath-handling.patch')
| -rw-r--r-- | main/abuild/0001-abuild-fix-ldpath-handling.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/main/abuild/0001-abuild-fix-ldpath-handling.patch b/main/abuild/0001-abuild-fix-ldpath-handling.patch new file mode 100644 index 0000000000..d9acce449d --- /dev/null +++ b/main/abuild/0001-abuild-fix-ldpath-handling.patch @@ -0,0 +1,27 @@ +From f43f6d312b52702ce8020477960ab0521018b745 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 30 Jul 2013 12:16:44 +0000 +Subject: [PATCH] abuild: fix ldpath handling + +it wrongly scanned /lib instead of $datadir/lib, causing bad things to +happen when scanning provides +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index 8c93658..51b4a6a 100755 +--- a/abuild.in ++++ b/abuild.in +@@ -1020,7 +1020,7 @@ find_scanelf_paths() { + local datadir="$1" + local paths="$datadir/lib:$datadir/usr/lib" i= rpaths= + if [ -n "$ldpath" ]; then +- paths="$paths:$(echo "$ldpath" | sed "s|\(^\|:\)|\1$datadir|g")" ++ paths="$paths:$(echo "${datadir}${ldpath}" | sed "s|:|:$datadir|g")" + fi + # search in all rpaths + for rpaths in "$pkgbasedir"/.control.*/.rpaths; do +-- +1.8.3.4 + |