From 20dea145bbb01054cb5c58124dd66ee1758b01be425090e4ad35935e26af9a34 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 10 Jan 2018 08:02:37 +0000 Subject: [PATCH] - Do not install target parts of cross compilers into the sysroot but instead fixup manually (once required). OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=101 --- cross-aarch64-gcc7.changes | 6 ++++++ cross-aarch64-gcc7.spec | 6 +++++- cross-arm-gcc7.changes | 6 ++++++ cross-arm-gcc7.spec | 6 +++++- cross-avr-gcc7-bootstrap.changes | 6 ++++++ cross-avr-gcc7-bootstrap.spec | 6 +++++- cross-avr-gcc7.changes | 6 ++++++ cross-avr-gcc7.spec | 6 +++++- cross-epiphany-gcc7-bootstrap.changes | 6 ++++++ cross-epiphany-gcc7-bootstrap.spec | 6 +++++- cross-epiphany-gcc7.changes | 6 ++++++ cross-epiphany-gcc7.spec | 6 +++++- cross-hppa-gcc7.changes | 6 ++++++ cross-hppa-gcc7.spec | 6 +++++- cross-i386-gcc7.changes | 6 ++++++ cross-i386-gcc7.spec | 6 +++++- cross-m68k-gcc7.changes | 6 ++++++ cross-m68k-gcc7.spec | 6 +++++- cross-mips-gcc7.changes | 6 ++++++ cross-mips-gcc7.spec | 6 +++++- cross-nvptx-gcc7.changes | 6 ++++++ cross-nvptx-gcc7.spec | 6 +++++- cross-ppc64-gcc7.changes | 6 ++++++ cross-ppc64-gcc7.spec | 6 +++++- cross-ppc64le-gcc7.changes | 6 ++++++ cross-ppc64le-gcc7.spec | 6 +++++- cross-rx-gcc7-bootstrap.changes | 6 ++++++ cross-rx-gcc7-bootstrap.spec | 6 +++++- cross-rx-gcc7.changes | 6 ++++++ cross-rx-gcc7.spec | 6 +++++- cross-s390x-gcc7.changes | 6 ++++++ cross-s390x-gcc7.spec | 6 +++++- cross-sparc-gcc7.changes | 6 ++++++ cross-sparc-gcc7.spec | 6 +++++- cross-sparc64-gcc7.changes | 6 ++++++ cross-sparc64-gcc7.spec | 6 +++++- cross-x86_64-gcc7.changes | 6 ++++++ cross-x86_64-gcc7.spec | 6 +++++- cross.spec.in | 6 +++++- gcc7-testresults.changes | 6 ++++++ gcc7.changes | 6 ++++++ 41 files changed, 226 insertions(+), 20 deletions(-) diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index 34508a2..fb414cc 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index 1f60303..9160de5 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index 97994c7..25f848d 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec index a01f3e3..2f8b53b 100644 --- a/cross-avr-gcc7-bootstrap.spec +++ b/cross-avr-gcc7-bootstrap.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index 8c88243..151a22b 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index 97994c7..25f848d 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index 91f6c5c..12eb354 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -601,7 +601,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index abad368..041b5e4 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index fc3b3d6..02494d4 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index 8ade498..eba9880 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index 9d77f21..301d9ed 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index baaf5d0..ed6eceb 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec index 4475de2..fbc88fe 100644 --- a/cross-nvptx-gcc7.spec +++ b/cross-nvptx-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index b10e6df..aeac850 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index 5239638..56cdcf8 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index 97994c7..25f848d 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index 71db5bc..7ab362b 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -601,7 +601,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index 13afe7a..17ae9c0 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index 81e0e4d..67d4b9b 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index 43abf47..8ad8168 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index a25327e..82c5efb 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index 97994c7..25f848d 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index 3fb957f..c8605d3 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -600,7 +600,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/cross.spec.in b/cross.spec.in index 5a6f47a..07f3481 100644 --- a/cross.spec.in +++ b/cross.spec.in @@ -179,7 +179,11 @@ export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >../debugfiles.list : >../debugsources.list -make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target +# We want shared libraries to reside in the sysroot but the .so symlinks +# on the host. Once we have a cross target that has shared libs we need +# to manually fix up things here like we do for non-cross compilers +mkdir -p $RPM_BUILD_ROOT/%{?sysroot:%sysroot} +make DESTDIR=$RPM_BUILD_ROOT install-target %endif %endif diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index 97994c7..25f848d 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com diff --git a/gcc7.changes b/gcc7.changes index 97994c7..25f848d 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 08:01:42 UTC 2018 - rguenther@suse.com + +- Do not install target parts of cross compilers into the sysroot + but instead fixup manually (once required). + ------------------------------------------------------------------- Tue Jan 2 13:29:18 UTC 2018 - rguenther@suse.com