From 57c3ac59bff81cca69093878bf037c569740c59c Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 19 Jul 2017 23:07:34 +0200 Subject: [PATCH] Adjust gcc-armhf/gcc-aarch64 to upstream --- aports/gcc-aarch64/APKBUILD | 7 ++++--- aports/gcc-armhf/APKBUILD | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/aports/gcc-aarch64/APKBUILD b/aports/gcc-aarch64/APKBUILD index adeea4db..47fb0f2d 100644 --- a/aports/gcc-aarch64/APKBUILD +++ b/aports/gcc-aarch64/APKBUILD @@ -360,9 +360,10 @@ package() { find "$pkgdir" -name 'ffi*.h' | xargs rm -f local gdblib=${_target:+$CTARGET/}lib - mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib - mv "$pkgdir"/usr/$gdblib/*-gdb.py \ - "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/ + for i in $(find "$pkgdir"/usr/$gdblib/ -type f -maxdepth 1 -name "*-gdb.py" ); do + mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib + mv "$i" "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/ + done paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1 diff --git a/aports/gcc-armhf/APKBUILD b/aports/gcc-armhf/APKBUILD index db175d93..af4f8d0b 100644 --- a/aports/gcc-armhf/APKBUILD +++ b/aports/gcc-armhf/APKBUILD @@ -360,9 +360,10 @@ package() { find "$pkgdir" -name 'ffi*.h' | xargs rm -f local gdblib=${_target:+$CTARGET/}lib - mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib - mv "$pkgdir"/usr/$gdblib/*-gdb.py \ - "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/ + for i in $(find "$pkgdir"/usr/$gdblib/ -type f -maxdepth 1 -name "*-gdb.py" ); do + mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib + mv "$i" "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/ + done paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1