From 92f49cf55f28c205b560693205d873863ae29b17 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 17 May 2018 18:37:20 +0000 Subject: [PATCH] gcc: fixed and synced changes with uptream --- gcc/.footprint | 13 ++++++------- gcc/Pkgfile | 9 +++++++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gcc/.footprint b/gcc/.footprint index 5624c43..e143c6d 100644 --- a/gcc/.footprint +++ b/gcc/.footprint @@ -2,13 +2,6 @@ drwxr-xr-x root/root lib/ lrwxrwxrwx root/root lib/cpp -> ../usr/bin/cpp drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/arm-crux-linux-gnueabihf-c++ --rwxr-xr-x root/root usr/bin/arm-crux-linux-gnueabihf-g++ --rwxr-xr-x root/root usr/bin/arm-crux-linux-gnueabihf-gcc --rwxr-xr-x root/root usr/bin/arm-crux-linux-gnueabihf-gcc-7.3.0 --rwxr-xr-x root/root usr/bin/arm-crux-linux-gnueabihf-gcc-ar --rwxr-xr-x root/root usr/bin/arm-crux-linux-gnueabihf-gcc-nm --rwxr-xr-x root/root usr/bin/arm-crux-linux-gnueabihf-gcc-ranlib lrwxrwxrwx root/root usr/bin/c++ -> g++ lrwxrwxrwx root/root usr/bin/cc -> gcc -rwxr-xr-x root/root usr/bin/cpp @@ -1363,3 +1356,9 @@ drwxr-xr-x root/root usr/man/man7/ -rw-r--r-- root/root usr/man/man7/fsf-funding.7.gz -rw-r--r-- root/root usr/man/man7/gfdl.7.gz -rw-r--r-- root/root usr/man/man7/gpl.7.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/gdb/ +drwxr-xr-x root/root usr/share/gdb/auto-load/ +drwxr-xr-x root/root usr/share/gdb/auto-load/usr/ +drwxr-xr-x root/root usr/share/gdb/auto-load/usr/lib/ +-rw-r--r-- root/root usr/share/gdb/auto-load/usr/lib/libstdc++.so.6.0.24-gdb.py diff --git a/gcc/Pkgfile b/gcc/Pkgfile index 27ce801..325c7bb 100644 --- a/gcc/Pkgfile +++ b/gcc/Pkgfile @@ -63,9 +63,14 @@ build() { mv $PKG/usr/lib/gcc/*/$version/include-fixed/{limits.h,syslimits.h} $PKG/usr/lib/gcc/*/$version/include/ - rm $PKG/usr/lib/libstdc++.so.6.0.24-gdb.py - rm -r $PKG/usr/share + rm -r $PKG/usr/share/{info,$name-$version} + rm -r $PKG/usr/bin/*-crux-linux-* rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed} + for D in lib; do + install -d -m 0755 $PKG/usr/share/gdb/auto-load/usr/${D} + mv $PKG/usr/${D}/libstdc++.so.*-gdb.py $PKG/usr/share/gdb/auto-load/usr/${D} + done + sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/{libstdc++.la,libsupc++.la} } -- 2.26.2