- Fix nvptx offload target compiler install so GCC can pick up

required files.  Split out the newlib part into cross-nvptx-newlib7-devel
  and avoid conflicts with GCC 8 variant via Provides/Conflicts
  of cross-nvptx-newlib-devel.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=116
This commit is contained in:
Richard Biener 2018-03-01 13:09:00 +00:00 committed by Git OBS Bridge
parent 71f5236cbd
commit 10f42a1030
41 changed files with 629 additions and 80 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -132,6 +132,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -566,6 +567,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -625,6 +637,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -751,16 +767,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -768,4 +781,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -132,6 +132,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -566,6 +567,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -625,6 +637,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -751,16 +767,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -768,4 +781,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%endif %endif
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
Requires: nvptx-tools Requires: nvptx-tools
ExclusiveArch: ExclusiveArch:
%define nvptx_newlib 1 %define nvptx_newlib 1
@ -565,6 +566,17 @@ Group: Development/Languages/C and C++
This package contains the icecream environment for the GNU C Compiler This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib7-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib7-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -750,16 +766,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc7-icecream-backend %files -n cross-%cross_arch-gcc7-icecream-backend
@ -767,4 +780,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib7-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog %changelog

View File

@ -111,6 +111,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
%if %{cross_arch} == "nvptx" %if %{cross_arch} == "nvptx"
BuildRequires: nvptx-tools BuildRequires: nvptx-tools
Requires: nvptx-tools Requires: nvptx-tools
Requires: cross-nvptx-newlib-devel >= %{version}-%{release}
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%define nvptx_newlib 1 %define nvptx_newlib 1
%endif %endif
@ -161,6 +162,18 @@ This package contains the icecream environment for the GNU C Compiler
%endif %endif
%if 0%{?nvptx_newlib:1}
%package -n cross-nvptx-newlib@base_ver@-devel
Summary: newlib for the nvptx offload target
Group: Development/Languages/C and C++
Provides: cross-nvptx-newlib-devel = %{version}-%{release}
Conflicts: cross-nvptx-newlib-devel
%description -n cross-nvptx-newlib@base_ver@-devel
Newlib development files for the nvptx offload target compiler.
%endif
%define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version}
%install %install
@ -221,6 +234,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1
rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus
rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools
# also move things from target directories into the accel path since
# that is the place where we later search for (only)
( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - )
rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}
%endif %endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
@ -347,16 +364,13 @@ fi
%endif %endif
%endif %endif
%endif %endif
%endif
%dir %{targetlibsubdir} %dir %{targetlibsubdir}
%dir %{_libdir}/gcc/%{gcc_target_arch} %dir %{_libdir}/gcc/%{gcc_target_arch}
%{targetlibsubdir} %{targetlibsubdir}
%endif
%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
%{sysroot} %{sysroot}
%endif %endif
%if 0%{?nvptx_newlib:1}
%{_prefix}/%{gcc_target_arch}
%endif
%if 0%{?gcc_icecream:%gcc_icecream} %if 0%{?gcc_icecream:%gcc_icecream}
%files -n cross-%cross_arch-gcc@base_ver@-icecream-backend %files -n cross-%cross_arch-gcc@base_ver@-icecream-backend
@ -364,4 +378,10 @@ fi
/usr/share/icecream-envs /usr/share/icecream-envs
%endif %endif
%if 0%{?nvptx_newlib:1}
%files -n cross-nvptx-newlib@base_ver@-devel
%defattr(-,root,root)
%{_prefix}/%{gcc_target_arch}
%endif
%changelog -n cross-%{pkgname}-gcc@base_ver@ %changelog -n cross-%{pkgname}-gcc@base_ver@

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com
- Fix nvptx offload target compiler install so GCC can pick up
required files. Split out the newlib part into cross-nvptx-newlib7-devel
and avoid conflicts with GCC 8 variant via Provides/Conflicts
of cross-nvptx-newlib-devel.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz