diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-04-30 07:50:20 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-04-30 07:52:54 +0000 |
| commit | a08386611b5d6c45b77f253d8bee4b3093ae27fe (patch) | |
| tree | 188228a4982132388f7dc08156ed174f21626371 /main/abuild | |
| parent | 165c6945f82ced8716cfb6ef78219582d51d4f42 (diff) | |
| download | aports-a08386611b5d6c45b77f253d8bee4b3093ae27fe.tar.bz2 aports-a08386611b5d6c45b77f253d8bee4b3093ae27fe.tar.xz | |
main/abuild: upgrade to 3.4.0_rc3
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-default_dbg-eliminate-side-effects.patch | 68 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 8 |
2 files changed, 3 insertions, 73 deletions
diff --git a/main/abuild/0001-abuild-default_dbg-eliminate-side-effects.patch b/main/abuild/0001-abuild-default_dbg-eliminate-side-effects.patch deleted file mode 100644 index 4c311664c1..0000000000 --- a/main/abuild/0001-abuild-default_dbg-eliminate-side-effects.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 5b163c2d58c7a135fd6ff6dc31995252f1c139d2 Mon Sep 17 00:00:00 2001 -From: tcely <tcely@users.noreply.github.com> -Date: Mon, 29 Apr 2019 16:45:23 -0400 -Subject: [PATCH] abuild: default_dbg: eliminate side effects - -- do not overwrite variables - -srcdir is very important for abuild operation - -- quoted various paths -- use a sub-shell to contain directory changing - -Resolves alpinelinux/abuild#58 ---- - abuild.in | 35 ++++++++++++++++++----------------- - 1 file changed, 18 insertions(+), 17 deletions(-) - -diff --git a/abuild.in b/abuild.in -index d0ae691..7acc422 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -1676,25 +1676,26 @@ doc() { - - # predefined splitfunc dbg - default_dbg() { -- local f -+ local ddbg_binfiles f ddbg_srcdir ddbg_srcfile ddbg_dstdir ddbg_dstfile - pkgdesc="$pkgdesc (debug symbols)" - -- binfiles=$(scanelf -R "$pkgdir" | grep ET_DYN | sed "s:$pkgdir\/::g" | sed "s:ET_DYN ::g") -- for f in $binfiles; do -- srcdir=$(dirname $pkgdir/$f) -- srcfile=$(basename $pkgdir/$f) -- dstdir=$(dirname $subpkgdir/usr/lib/debug/$f.debug) -- dstfile=$(basename $subpkgdir/usr/lib/debug/$f.debug) -- if [ ! -d $dstdir ] ; then -- mkdir -p $dstdir -- fi -- cd $srcdir -- local XATTR=$(getfattr --match="" --dump "${srcfile}") -- ${CROSS_COMPILE}objcopy --only-keep-debug $srcfile $dstfile -- ${CROSS_COMPILE}objcopy --add-gnu-debuglink=$dstfile $srcdir/$srcfile -- mv $dstfile $dstdir -- ${CROSS_COMPILE}strip $srcfile -- [ -n "$XATTR" ] && { echo "$XATTR" | setfattr --restore=-; } -+ ddbg_binfiles=$(scanelf -R "$pkgdir" | grep ET_DYN | sed "s:$pkgdir\/::g" | sed "s:ET_DYN ::g") -+ for f in $ddbg_binfiles; do -+ ddbg_srcdir=$(dirname "$pkgdir/$f") -+ ddbg_srcfile=$(basename "$pkgdir/$f") -+ ddbg_dstdir=$(dirname "$subpkgdir/usr/lib/debug/$f.debug") -+ ddbg_dstfile=$(basename "$subpkgdir/usr/lib/debug/$f.debug") -+ [ -d "$ddbg_dstdir" ] || mkdir -p "$ddbg_dstdir" -+ -+ ( -+ cd "$ddbg_srcdir" -+ XATTR=$(getfattr --match="" --dump "${ddbg_srcfile}") -+ ${CROSS_COMPILE}objcopy --only-keep-debug "$ddbg_srcfile" "$ddbg_dstfile" -+ ${CROSS_COMPILE}objcopy --add-gnu-debuglink="$ddbg_dstfile" "$ddbg_srcdir/$ddbg_srcfile" -+ mv "$ddbg_dstfile" "$ddbg_dstdir" -+ ${CROSS_COMPILE}strip "$ddbg_srcfile" -+ [ -n "$XATTR" ] && { echo "$XATTR" | setfattr --restore=-; } -+ ) - done - return 0 - } --- -2.21.0 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 0e33512b51..5852016921 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abuild -pkgver=3.4.0_rc2 +pkgver=3.4.0_rc3 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=0 pkgdesc="Script to build Alpine Packages" url="https://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -21,7 +21,6 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch options="suid !check" pkggroups="abuild" source="https://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz - 0001-abuild-default_dbg-eliminate-side-effects.patch " builddir="$srcdir/$pkgname-$_ver" @@ -69,5 +68,4 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="b63b4e8cdb16d29f012830f7fb6eb4450d813b434166bf911ac257348d36d3d08326aebe076e64358557eebc962a4241237e82e2be3be3e6ee595751498f3af8 abuild-3.4.0_rc2.tar.xz -fb81e4d0ed800cd962377f2269c4cffc48b440bd0f6ae09e369f55da24e2b68134c5c35e2f8c3309d42d674b18ff57216349112c2d4d408b3cc2b57db2d30d62 0001-abuild-default_dbg-eliminate-side-effects.patch" +sha512sums="c528f5db0abd079e4b5d93388ccc2e95cc1c4be14efbbd646393d5a868cf3f2bbbf9e13bc3a5468cd95878c018b02f0eb30d7fa829d5737f7ab87d439073dd79 abuild-3.4.0_rc3.tar.xz" |