diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-07-25 05:50:20 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-07-27 12:06:56 +0000 |
| commit | 89835de93f816e913cd25b0ad4f5f5545ff0bdfc (patch) | |
| tree | af64240430e1faefecae163e6b47d3da174c2117 /abuild.in | |
| parent | 24022b3c825bcd46b108ac8b173bd40e137f73e8 (diff) | |
| download | abuild-89835de93f816e913cd25b0ad4f5f5545ff0bdfc.tar.bz2 abuild-89835de93f816e913cd25b0ad4f5f5545ff0bdfc.tar.xz | |
abuild: use proper strip for each subpkg according to it's arch
Diffstat (limited to 'abuild.in')
| -rw-r--r-- | abuild.in | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -132,13 +132,6 @@ default_sanitycheck() { esac done - # check if CARCH, CBUILD, CHOST and CTARGET is set - [ -z "$CHOST" ] && die "Please set CHOST in /etc/abuild.conf" - - if [ -z "$CARCH" ]; then - die "Please fix CHOST, or set CARCH in abuild.conf" - fi - for i in $install; do local n=${i%.*} local suff=${i##*.} @@ -1502,10 +1495,10 @@ default_dbg() { mkdir -p $dstdir fi cd $srcdir - objcopy --only-keep-debug $srcfile $dstfile - objcopy --add-gnu-debuglink=$dstfile $srcdir/$srcfile + ${CROSS_COMPILE}objcopy --only-keep-debug $srcfile $dstfile + ${CROSS_COMPILE}objcopy --add-gnu-debuglink=$dstfile $srcdir/$srcfile mv $dstfile $dstdir - strip $srcfile + ${CROSS_COMPILE}strip $srcfile done return 0 } @@ -1934,12 +1927,20 @@ stripbin() { return 0 fi cd "${subpkgdir:-$pkgdir}" || return 1 + + local stripcmd=strip + case "${subpkgarch:-$pkgarch}" in + $CBUILD_ARCH) stripcmd="strip" ;; + $CARCH) stripcmd="${CHOST}-strip" ;; + $CTARGET_ARCH) stripcmd="${CTARGET}-strip" ;; + 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 XATTR=$(getfattr --match="" --dump "${filename}") - ${CROSS_COMPILE}strip "${filename}" + "${stripcmd}" "${filename}" [ -n "$XATTR" ] && (echo "$XATTR" | setfattr --restore=-) done } |