diff options
| author | James Forcier <csssuf@users.noreply.github.com> | 2020-04-12 02:13:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 16:13:45 +1000 |
| commit | f538b2273a4b9126b5dbfb54218dc40df047b249 (patch) | |
| tree | 44f6c7f940c82254d66c58fe1cec1921272b5e3c | |
| parent | 50e85f91e87f7fdb2e64b2d79c49c742f2f6e768 (diff) | |
| download | firmware-f538b2273a4b9126b5dbfb54218dc40df047b249.tar.gz firmware-f538b2273a4b9126b5dbfb54218dc40df047b249.tar.bz2 firmware-f538b2273a4b9126b5dbfb54218dc40df047b249.zip | |
Upgrade gcc version/tweak package installs in Gentoo installation (#8757)
GCC 4.9.4 is no longer available on Gentoo (or Sabayon), which causes
problems when attempting to install on either of these platforms. Since
QMK is not particularly sensitive to its GCC version, modify the version
restriction to <9 so newer versions of GCC may be installed. Since the
toolchain for arm-none-eabi isn't currently installed as part of setup,
add that as well.
Additionally, drop the Python installation as part of the Gentoo
installation process. Python is a core system package on Gentoo and can
therefore be assumed to be present; in addition, the slot restriction of
3.5 which was present is also no longer available in Gentoo.
Finally, separate the gcc rebuild invocation of `emerge` from the new
packages that may need to be installed, and apply the `--noreplace` flag
to new packages so that they are not rebuilt if already present.
| -rwxr-xr-x | util/linux_install.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/util/linux_install.sh b/util/linux_install.sh index 048b2f318..9ef064157 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -105,17 +105,17 @@ elif grep ID /etc/os-release | grep -q gentoo; then sudo touch /etc/portage/package.use/qmkfirmware # tee is used here since sudo doesn't apply to >> echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null - sudo emerge -auN \ + sudo emerge -auN sys-devel/gcc + sudo emerge -au --noreplace \ app-arch/unzip \ app-arch/zip \ app-mobilephone/dfu-util \ dev-embedded/avrdude \ - dev-lang/python:3.5 \ net-misc/wget \ sys-devel/clang \ - sys-devel/gcc \ sys-devel/crossdev - sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr + sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr + sudo crossdev -s4 --stable --g \<9 --portage --verbose --target arm-none-eabi echo "Done!" else echo "Quitting..." @@ -132,7 +132,8 @@ elif grep ID /etc/os-release | grep -q sabayon; then sys-devel/clang \ sys-devel/gcc \ sys-devel/crossdev - sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr + sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr + sudo crossdev -s4 --stable --g \<9 --portage --verbose --target arm-none-eabi echo "Done!" elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then |