From f538b2273a4b9126b5dbfb54218dc40df047b249 Mon Sep 17 00:00:00 2001 From: James Forcier Date: Sun, 12 Apr 2020 02:13:45 -0400 Subject: [PATCH] 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. --- util/linux_install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/util/linux_install.sh b/util/linux_install.sh index 048b2f3189..9ef0641576 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