gcc: cleanup. remove old tests, remove include-fixed

2 files changed, 4 insertions, 39 deletions

diff --git a/gcc/.footprint b/gcc/.footprint
index 36885edb..1892d9f0 100644
--- a/gcc/.footprint
+++ b/gcc/.footprint
@@ -809,31 +809,6 @@ drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/32/
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/crtprec64.o
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/crtprec80.o
 drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/finclude/
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/README
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/X11/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/X11/Xw32defs.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/limits.h
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/linux/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/linux/a.out.h
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/net-snmp/
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/net-snmp/library/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/net-snmp/library/snmpUDPBaseDomain.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/net-snmp/library/snmpUDPDomain.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/net-snmp/library/snmpUDPIPv4BaseDomain.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/net-snmp/net-snmp-config.h
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/nss/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/nss/secport.h
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/ntfs-3g/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/ntfs-3g/device_io.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/ntfs-3g/realpath.h
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/openssl/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/openssl/bn.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/syslimits.h
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/xorg/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/xorg/compiler.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/xorg/edid.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include-fixed/xorg/xf86str.h
 drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/adxintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/ammintrin.h
@@ -891,6 +866,7 @@ drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/cilk/
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/ia32intrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/immintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/iso646.h
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/limits.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/lwpintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/lzcntintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/mm3dnow.h
@@ -938,6 +914,7 @@ drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/ssp/
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/stdint-gcc.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/stdint.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/stdnoreturn.h
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/syslimits.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/tbmintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/tmmintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/unwind.h
@@ -951,18 +928,6 @@ drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/ssp/
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/xsaveoptintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/xsavesintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/include/xtestintrin.h
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/
--rwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/fixinc.sh
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/fixinc_list
--rwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/fixincl
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/gsyslimits.h
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/include/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/include/README
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/include/limits.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/macro_list
--rwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/mkheaders
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/mkheaders.conf
--rwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/install-tools/mkinstalldirs
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/libgcc.a
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/libgcc_eh.a
 -rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/libgcov.a
diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index 710b74d1..6d10ab2b 100644
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -37,11 +37,11 @@ build() {
     ln -sf gcc $PKG/usr/bin/cc
     ln -sf g++ $PKG/usr/bin/c++
 
-    #mv $PKG/usr/lib/gcc/*/$version/include-fixed/{limits.h,syslimits.h} $PKG/usr/lib/gcc/*/$version/include/
+    mv $PKG/usr/lib/gcc/*/$version/include-fixed/{limits.h,syslimits.h} $PKG/usr/lib/gcc/*/$version/include/
     rm -f $PKG/usr/lib{,32}/{libiberty.a,libstdc++.so.6.0.21-gdb.py}
     rm -r $PKG/usr/share 
     rm -r $PKG/usr/bin/*-linux-gnu-*
-    #rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed} 
+    rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed} 
 
     sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib{,32}/{libstdc++.la,libsupc++.la}
 }