From 8a40c245da66f4fd49a67ebcb60c82b77e2d8142 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 31 May 2017 18:18:45 +0200 Subject: [PATCH] Fix #19: gcc-armhf didn't compile anymore --- aports/gcc-armhf/APKBUILD | 1 + pmb/aportgen/gcc.py | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/aports/gcc-armhf/APKBUILD b/aports/gcc-armhf/APKBUILD index 94345570..c202f798 100644 --- a/aports/gcc-armhf/APKBUILD +++ b/aports/gcc-armhf/APKBUILD @@ -372,6 +372,7 @@ package() { 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/ paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1 diff --git a/pmb/aportgen/gcc.py b/pmb/aportgen/gcc.py index d4e3515e..b2433ec0 100644 --- a/pmb/aportgen/gcc.py +++ b/pmb/aportgen/gcc.py @@ -57,10 +57,6 @@ def generate(args, pkgname): # Do not package libstdc++ '*subpackages="$subpackages libstdc++:libcxx:*': ' subpackages="$subpackages g++$_target:gpp"', - - # Do not move gdb.py - '*-gdb.py*': None, - '*/usr/share/gdb/python/auto-load/usr/lib/*': None, } pmb.aportgen.core.rewrite(