diff options
| author | David Howells <dhowells@redhat.com> | 2014-03-28 10:19:58 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-03-28 10:19:58 +0000 |
| commit | d648358e4664df72a95ce4b2e42e453de1d39022 (patch) | |
| tree | e523407b0ae20159e9d801ee6607ac2860fe2d69 | |
| parent | 5884884b79c5dc1b988cba779d1a860d5dd15486 (diff) | |
| download | cross-binutils-d648358e4664df72a95ce4b2e42e453de1d39022.tar.gz cross-binutils-d648358e4664df72a95ce4b2e42e453de1d39022.tar.xz cross-binutils-d648358e4664df72a95ce4b2e42e453de1d39022.zip | |
Fix sysroot [BZ 1011412]
We can't set sysroot to "/" as that means libgcc will pick up stuff from
/usr/include - which is very likely inapplicable to the arch.
The sysroot will instead be:
/usr/<program-prefix>/sys-root/
| -rw-r--r-- | cross-binutils.spec | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cross-binutils.spec b/cross-binutils.spec index 586a583..d3afff5 100644 --- a/cross-binutils.spec +++ b/cross-binutils.spec @@ -47,7 +47,7 @@ Summary: A GNU collection of cross-compilation binary utilities Name: %{cross}-binutils Version: 2.24 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -323,10 +323,12 @@ function config_target () { mn10300-*) target=am33_2.0-linux;; m68knommu-*) target=m68k-linux;; openrisc-*) target=openrisc-elf;; + parisc-*) target=hppa-linux;; score-*) target=score-elf;; sh64-*) target=sh64-linux;; tile-*) target=tilegx-linux;; v850-*) target=v850e-linux;; + x86-*) target=x86_64-linux;; *) target=$arch;; esac @@ -388,7 +390,7 @@ function config_target () { --program-prefix=$prefix \ --disable-shared \ --disable-install_libbfd \ - --with-sysroot=/ \ + --with-sysroot=%{_prefix}/$arch/sys-root \ $CARGS \ --with-bugurl=http://bugzilla.redhat.com/bugzilla/ cd .. @@ -475,6 +477,7 @@ function install_bin () { for target in `cat target.list` do echo "=== INSTALL target $target ===" + mkdir -p %{buildroot}%{_prefix}/$target/sys-root install_bin $target # if [ $target = sh64-linux-gnu ] @@ -539,6 +542,7 @@ function build_file_list () { echo %{auxbin_prefix}/$target_cpu-*/bin/\* fi echo %{_mandir}/man1/$arch-\* + echo %{_prefix}/$arch/sys-root ) >files.$arch } @@ -656,6 +660,9 @@ rm -rf %{buildroot} %do_files xtensa-linux-gnu %{build_xtensa} %changelog +* Fri Mar 28 2014 David Howells <dhowells@redhat.com> - 2.24-2 +- A sysroot of / is bad, so make it /usr/<program-prefix>/sys-root/. + * Thu Mar 27 2014 David Howells <dhowells@redhat.com> - 2.24-1 - Fix formatless sprintfs in Score. |