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 | |
| parent | c212923f6229950a08dc95fcee417d69123b5ea8 (diff) | |
| download | aports-a4d45f7f15e6b92de57accd07cf20782ec8bdf7a.tar.bz2 aports-a4d45f7f15e6b92de57accd07cf20782ec8bdf7a.tar.xz | |
main/abuild: backport ldpath fix
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-fix-ldpath-handling.patch | 27 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 14 |
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 965d9dc949..4dccaa7928 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -3,7 +3,7 @@ pkgdesc="Script to build Alpine Packages" pkgname=abuild pkgver=2.15.0 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=2 url=http://git.alpinelinux.org/cgit/abuild/ depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 abuildhelper libc-utils" @@ -16,7 +16,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() { @@ -53,6 +54,9 @@ cpan() { mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/ } -md5sums="ba2a10bed1efbe31c52de6f64dd9bbf2 abuild-2.15.0.tar.xz" -sha256sums="5518079b8897746d9603cf3692400ec1c6b6af5f57fb003c27edcbd35511dd74 abuild-2.15.0.tar.xz" -sha512sums="d7f2c38f81743e2c8c787d2a9a7c7fa7ec2fbf89c32e72e8a84e66fd517686456e201108388f36250d37804b422ecfacbca4a463172d05359deb9d65e6b20426 abuild-2.15.0.tar.xz" +md5sums="ba2a10bed1efbe31c52de6f64dd9bbf2 abuild-2.15.0.tar.xz +b0ab439f64579ad231de83e5979d6214 0001-abuild-fix-ldpath-handling.patch" +sha256sums="5518079b8897746d9603cf3692400ec1c6b6af5f57fb003c27edcbd35511dd74 abuild-2.15.0.tar.xz +3658b6a34747f77e91706568d594aa2a9c250dfcbfa0d5da53379d00c527cc6a 0001-abuild-fix-ldpath-handling.patch" +sha512sums="d7f2c38f81743e2c8c787d2a9a7c7fa7ec2fbf89c32e72e8a84e66fd517686456e201108388f36250d37804b422ecfacbca4a463172d05359deb9d65e6b20426 abuild-2.15.0.tar.xz +79eddd7fb2ca3a9cd9bd61aa54578b16bdd711471d9915b0236896562b1233aec1c03246aa2306ce70113847f0dcc959825c01ac93410927732fe4ed48b64cdb 0001-abuild-fix-ldpath-handling.patch" |