mg/qmk_sweep_skeletyl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Upgrade gcc version/tweak package installs in Gentoo installation (#8757)

Browse source 
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.
This commit is contained in:
James Forcier 2020-04-12 02:13:45 -04:00 committed by GitHub
parent 50e85f91e8
commit f538b2273a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
util/linux_install.sh
View file

@ -105,17 +105,17 @@ elif grep ID /etc/os-release | grep -q gentoo; then
sudo touch /etc/portage/package.use/qmkfirmware sudo touch /etc/portage/package.use/qmkfirmware
# tee is used here since sudo doesn't apply to >> # 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 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/unzip \
app-arch/zip \ app-arch/zip \
app-mobilephone/dfu-util \ app-mobilephone/dfu-util \
dev-embedded/avrdude \ dev-embedded/avrdude \
dev-lang/python:3.5 \
net-misc/wget \ net-misc/wget \
sys-devel/clang \ sys-devel/clang \
sys-devel/gcc \
sys-devel/crossdev 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!" echo "Done!"
else else
echo "Quitting..." echo "Quitting..."
@ -132,7 +132,8 @@ elif grep ID /etc/os-release | grep -q sabayon; then
sys-devel/clang \ sys-devel/clang \
sys-devel/gcc \ sys-devel/gcc \
sys-devel/crossdev 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!" echo "Done!"
elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then