Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable solaris targets. #838

Merged
merged 1 commit into from
Jun 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,8 @@ jobs:
- { target: i686-unknown-freebsd, os: ubuntu-latest, dylib: 1, std: 1 }
- { target: x86_64-unknown-freebsd, os: ubuntu-latest, dylib: 1, std: 1 }
- { target: x86_64-unknown-netbsd, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1 }
# Disabled, see #534
#-{ target: sparcv9-sun-solaris, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1 }
#-{ target: x86_64-sun-solaris, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1 }
- { target: sparcv9-sun-solaris, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1 }
- { target: x86_64-sun-solaris, os: ubuntu-latest, cpp: 1, dylib: 1, std: 1 }
- { target: thumbv6m-none-eabi, os: ubuntu-latest, std: 1 }
- { target: thumbv7em-none-eabi, os: ubuntu-latest, std: 1 }
- { target: thumbv7em-none-eabihf, os: ubuntu-latest, std: 1 }
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Changed

- #838 - re-enabled the solaris targets.
- #807 - update Qemu to 6.1.0 on images using Ubuntu 18.04+ with python3.6+.
- #775 - forward Cargo exit code to host
- #762 - re-enabled `x86_64-unknown-dragonfly` target.
Expand Down
31 changes: 18 additions & 13 deletions docker/solaris.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ main() {
local arch="${1}"

local binutils=2.28.1 \
gcc=6.4.0 \
gcc=8.4.0 \
target="${arch}-sun-solaris2.10"

install_packages bzip2 \
Expand Down Expand Up @@ -58,18 +58,21 @@ main() {
add-apt-repository -y 'deb http://apt.dilos.org/dilos dilos2-testing main'
dpkg --add-architecture "${apt_arch}"
apt-get update
apt-cache depends --recurse --no-replaces \
"libc:${apt_arch}" \
"libdl-dev:${apt_arch}" \
"libm-dev:${apt_arch}" \
"libnsl-dev:${apt_arch}" \
"libpthread-dev:${apt_arch}" \
"libresolv-dev:${apt_arch}" \
"librt:${apt_arch}" \
"libsocket-dev:${apt_arch}" \
"system-crt:${apt_arch}" \
"system-header:${apt_arch}" \
| grep "^\w" | xargs apt-get download
# shellcheck disable=SC2046
apt-get download $(apt-cache depends --recurse --no-replaces \
"libc:${apt_arch}" \
"liblgrp-dev:${apt_arch}" \
"liblgrp:${apt_arch}" \
"libm-dev:${apt_arch}" \
"libpthread:${apt_arch}" \
"libresolv:${apt_arch}" \
"librt:${apt_arch}" \
"libsendfile-dev:${apt_arch}" \
"libsendfile:${apt_arch}" \
"libsocket:${apt_arch}" \
"system-crt:${apt_arch}" \
"system-header:${apt_arch}" \
| grep "^\w")

for deb in *"${apt_arch}.deb"; do
dpkg -x "${deb}" "${td}/solaris"
Expand Down Expand Up @@ -102,6 +105,8 @@ EOF
ln -s usr/include "${destdir}/sys-include"
ln -s usr/include "${destdir}/include"

# note: solaris2.10 is obsolete, so we can't upgrade to GCC 10 till then.
# for gcc 9.4.0, need `--enable-obsolete`
cd gcc-build
../gcc/configure \
--disable-libada \
Expand Down