diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-09-28 10:46:06 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-09-28 10:46:47 +0000 |
| commit | 0f820f1719b54529d4251328a4db91cd50c8e309 (patch) | |
| tree | 4d96635d6f64ab5622470c9496f291db51e169c0 /main/abuild | |
| parent | f2dbee20c9b4c04311de8640f08791df3e7393c0 (diff) | |
| download | aports-0f820f1719b54529d4251328a4db91cd50c8e309.tar.bz2 aports-0f820f1719b54529d4251328a4db91cd50c8e309.tar.xz | |
main/abuild: upgrade to 3.0.2
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-do-not-try-to-strip-standalone-elf-images.patch | 36 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 8 |
2 files changed, 3 insertions, 41 deletions
diff --git a/main/abuild/0001-abuild-do-not-try-to-strip-standalone-elf-images.patch b/main/abuild/0001-abuild-do-not-try-to-strip-standalone-elf-images.patch deleted file mode 100644 index ee4fc8d463..0000000000 --- a/main/abuild/0001-abuild-do-not-try-to-strip-standalone-elf-images.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4736a56c8e6ffee2f9101ab8d2b814eb239f5889 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Tue, 26 Sep 2017 07:26:02 +0000 -Subject: [PATCH 1/1] abuild: do not try to strip standalone elf images - -Guile uses ELF is internal object format, and creates them as -"no machine" and "standlone" OSABI. Scanelf supports printing -OSABI, so use that to filter these out. -See: https://github.com/alpinelinux/aports/pull/1714 - -This also removes unneccessary 'sed' from the pipeline as it's -simple to read each field outputted by scanelf. ---- - abuild.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/abuild.in b/abuild.in -index dae99b3..ef80891 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -2142,9 +2142,9 @@ stripbin() { - esac - - msg "Stripping binaries" -- scanelf --recursive --nobanner --etype "ET_DYN,ET_EXEC" . \ -- | sed -e 's:^ET_DYN ::' -e 's:^ET_EXEC ::' \ -- | while read filename; do -+ scanelf --recursive --nobanner --osabi --etype "ET_DYN,ET_EXEC" . \ -+ | while read type osabi filename; do -+ [ "$osabi" != "STANDALONE" ] || continue - local XATTR=$(getfattr --match="" --dump "${filename}") - "${stripcmd}" "${filename}" - if [ -n "$XATTR" ]; then --- -2.14.1 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 20960c161b..a88a162ef3 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abuild -pkgver=3.0.1 +pkgver=3.0.2 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=0 pkgdesc="Script to build Alpine Packages" url="http://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="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz - 0001-abuild-do-not-try-to-strip-standalone-elf-images.patch " builddir="$srcdir/$pkgname-$_ver" @@ -68,5 +67,4 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="390f25ba57bf827eb55cf789ec6e4489909d9c0b0ae7311944c569c3de23744d8985f9ba333234f45e294568a4de0cc1673bbd6f801950763ab1313333b848e1 abuild-3.0.1.tar.xz -e88777152a469ebb36efbfd79fd0293980aebb7260b56ee14d6ca131c7173dc578b4095514cca8fc6202b80b55f12935d7dcd578d602715a8ed61aa46db852f5 0001-abuild-do-not-try-to-strip-standalone-elf-images.patch" +sha512sums="74b379e13be79987511ad3a610c40ac7767d26c61b3c235b3c9c2f3bf4ea2cb289b47ef35d8475cc1e3602f371a92fe23833a0f1a60f2e3d231a747a917e9987 abuild-3.0.2.tar.xz" |