- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting

on non-existing target include directory.  Remove --with-build-sysroot=/
  hack from icecream cross configs, no longer prune include-fixed for
  them to retain a GCC provided limits.h.  Remove installed install-tools.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=94

cross-aarch64-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-aarch64-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-arm-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-arm-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-avr-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-avr-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-epiphany-gcc7-bootstrap.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-epiphany-gcc7-bootstrap.spec

@@ -79,7 +79,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -180,6 +179,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -256,6 +256,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -581,11 +582,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-epiphany-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-epiphany-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-hppa-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-hppa-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-i386-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-i386-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-m68k-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-m68k-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-mips-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-mips-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-nvptx-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-nvptx-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-ppc64-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-ppc64-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-ppc64le-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-ppc64le-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-rx-gcc7-bootstrap.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-rx-gcc7-bootstrap.spec

@@ -79,7 +79,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -180,6 +179,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -256,6 +256,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -581,11 +582,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-rx-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-rx-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-s390x-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-s390x-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-sparc-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-sparc-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-sparc64-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-sparc64-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross-x86_64-gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

cross-x86_64-gcc7.spec

@@ -78,7 +78,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -179,6 +178,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -255,6 +255,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61
@@ -580,11 +581,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

cross.spec.in

@@ -57,7 +57,6 @@
 %endif
 
 %if 0%{?gcc_icecream:1}
-%define build_sysroot /
 %define sysroot %{_prefix}/%{gcc_target_arch}
 %else
 # offloading builds newlib in-tree and can install in
@@ -160,11 +159,7 @@ cd obj-%{GCCDIST}
 
 # install and fixup host parts
 make DESTDIR=$RPM_BUILD_ROOT install-host
-%if 0%{?gcc_icecream:1}
+rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/install-tools
-# with the gcc_icecream setup fixincludes are for the build includes which
-# is wrong - get rid of them
-rm -rf $RPM_BUILD_ROOT/%{targetlibsubdir}/include-fixed
-%endif
 rm -f $RPM_BUILD_ROOT/%{targetlibsubdir}/liblto_plugin.la
 # common fixup
 rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

gcc.spec.in

@@ -304,6 +304,7 @@ Patch11:	gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:	gcc7-pr81481.diff
 Patch14:	gcc7-pr82248.diff
+Patch15:	gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:	gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -1059,6 +1060,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61

gcc7-avoid-fixinc-error.diff

@@ -0,0 +1,18 @@
+Index: gcc/Makefile.in
+===================================================================
+--- gcc/Makefile.in	(revision 255402)
++++ gcc/Makefile.in	(working copy)
+@@ -2993,13 +2993,6 @@ stmp-fixinc: gsyslimits.h macro_list fix
+ 	    sysroot_headers_suffix=`echo $${ml} | sed -e 's/;.*$$//'`; \
+ 	    multi_dir=`echo $${ml} | sed -e 's/^[^;]*;//'`; \
+ 	    fix_dir=include-fixed$${multi_dir}; \
+-	    if ! $(inhibit_libc) && test ! -d ${SYSTEM_HEADER_DIR}; then \
+-	      echo The directory that should contain system headers does not exist: >&2 ; \
+-	      echo "  ${SYSTEM_HEADER_DIR}" >&2 ; \
+-	      tooldir_sysinc=`echo "${gcc_tooldir}/sys-include" | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta`; \
+-	      if test "x${SYSTEM_HEADER_DIR}" = "x$${tooldir_sysinc}"; \
+-	      then sleep 1; else exit 1; fi; \
+-	    fi; \
+ 	    $(mkinstalldirs) $${fix_dir}; \
+ 	    chmod a+rx $${fix_dir} || true; \
+ 	    (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \

gcc7-testresults.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

gcc7-testresults.spec

@@ -317,6 +317,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -445,6 +446,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61

gcc7.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  8 10:32:47 UTC 2017 - rguenther@suse.com
+
+- Add gcc7-avoid-fixinc-error.diff to avoid install-host aborting
+  on non-existing target include directory.  Remove --with-build-sysroot=/
+  hack from icecream cross configs, no longer prune include-fixed for
+  them to retain a GCC provided limits.h.  Remove installed install-tools.
+
 -------------------------------------------------------------------
 Thu Nov 23 09:30:47 UTC 2017 - rguenther@suse.com
 

gcc7.spec

@@ -299,6 +299,7 @@ Patch11:        gcc7-remove-Wexpansion-to-defined-from-Wextra.patch
 Patch12:        gcc7-stack-probe.diff
 Patch13:        gcc7-pr81481.diff
 Patch14:        gcc7-pr82248.diff
+Patch15:        gcc7-avoid-fixinc-error.diff
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -1749,6 +1750,7 @@ ln -s nvptx-newlib/newlib .
 %patch12
 %patch13
 %patch14
+%patch15
 %patch51
 %patch60
 %patch61