aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-07-30 12:53:56 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-07-30 12:53:56 +0000
commit948272d905dbaa345a38bf77b41bf35d14edc003 (patch)
treea7955c780f1282ecd75725623db1f260bdb01343
parent4dbda03593fc0526f059db6d8397cf323105436f (diff)
downloadaports-948272d905dbaa345a38bf77b41bf35d14edc003.tar.bz2
aports-948272d905dbaa345a38bf77b41bf35d14edc003.tar.xz
main/abuild: backport ldpath fix
-rw-r--r--main/abuild/0001-abuild-fix-ldpath-handling.patch27
-rw-r--r--main/abuild/APKBUILD14
2 files changed, 36 insertions, 5 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
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index afbdeb86c4..ac939c01f9 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -3,7 +3,7 @@ pkgdesc="Script to build Alpine Packages"
pkgname=abuild
pkgver=2.14.3
_ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
url=http://git.alpinelinux.org/cgit/abuild/
depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1
abuildhelper curl libc-utils"
@@ -13,7 +13,8 @@ subpackages="apkbuild-cpan:cpan"
pkggroups="abuild"
arch="all"
license=GPL-2
-source="http://dev.alpinelinux.org/archive/abuild/abuild-$pkgver.tar.xz"
+source="http://dev.alpinelinux.org/archive/abuild/abuild-$pkgver.tar.xz
+ 0001-abuild-fix-ldpath-handling.patch"
_builddir="$srcdir/$pkgname-$_ver"
prepare() {
@@ -50,6 +51,9 @@ cpan() {
mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
}
-md5sums="38e58e3c22598913d18e25d532f43316 abuild-2.14.3.tar.xz"
-sha256sums="581f71bbf1d3de0e016dcbf130ce36061fa15ef890f5ebddb6c9c4b8aa3ba3a5 abuild-2.14.3.tar.xz"
-sha512sums="298cf587b18779d733650df442c91fd0b851c54c00f2ffcb6236eda844dde00310e2da1d4a673ac969b3bcf35387e91fd619ce608c4123067477fa9636699034 abuild-2.14.3.tar.xz"
+md5sums="38e58e3c22598913d18e25d532f43316 abuild-2.14.3.tar.xz
+b0ab439f64579ad231de83e5979d6214 0001-abuild-fix-ldpath-handling.patch"
+sha256sums="581f71bbf1d3de0e016dcbf130ce36061fa15ef890f5ebddb6c9c4b8aa3ba3a5 abuild-2.14.3.tar.xz
+3658b6a34747f77e91706568d594aa2a9c250dfcbfa0d5da53379d00c527cc6a 0001-abuild-fix-ldpath-handling.patch"
+sha512sums="298cf587b18779d733650df442c91fd0b851c54c00f2ffcb6236eda844dde00310e2da1d4a673ac969b3bcf35387e91fd619ce608c4123067477fa9636699034 abuild-2.14.3.tar.xz
+79eddd7fb2ca3a9cd9bd61aa54578b16bdd711471d9915b0236896562b1233aec1c03246aa2306ce70113847f0dcc959825c01ac93410927732fe4ed48b64cdb 0001-abuild-fix-ldpath-handling.patch"