aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/install/gentoo.sh2
-rwxr-xr-xutil/install/macos.sh15
-rw-r--r--util/usb_detach/usb_detach.c2
3 files changed, 10 insertions, 9 deletions
diff --git a/util/install/gentoo.sh b/util/install/gentoo.sh
index 49e80490be..3c8f417fb7 100755
--- a/util/install/gentoo.sh
+++ b/util/install/gentoo.sh
@@ -22,7 +22,7 @@ _qmk_install() {
echo "sys-devel/gcc multilib\ncross-arm-none-eabi/newlib nano" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
sudo emerge -auN sys-devel/gcc
sudo emerge -au --noreplace \
- app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang \
+ app-arch/unzip app-arch/zip net-misc/wget llvm-core/clang \
sys-devel/crossdev \>=dev-lang/python-3.7 dev-embedded/avrdude \
dev-embedded/dfu-programmer app-mobilephone/dfu-util sys-apps/hwloc \
dev-libs/hidapi
diff --git a/util/install/macos.sh b/util/install/macos.sh
index a1b79fe868..4db2f9be6b 100755
--- a/util/install/macos.sh
+++ b/util/install/macos.sh
@@ -9,23 +9,24 @@ _qmk_install_prepare() {
return 1
fi
+ # Conflicts with arm-none-eabi toolchain from osx-cross
+ brew uninstall --ignore-dependencies --cask gcc-arm-embedded >/dev/null 2>&1
+ brew uninstall --ignore-dependencies homebrew/core/arm-none-eabi-gcc >/dev/null 2>&1
+ brew uninstall --ignore-dependencies homebrew/core/arm-none-eabi-binutils >/dev/null 2>&1
+ brew uninstall --ignore-dependencies osx-cross/arm/arm-gcc-bin@8 >/dev/null 2>&1
+
brew update && brew upgrade --formulae
}
_qmk_install() {
echo "Installing dependencies"
- # All macOS dependencies are managed in the Homebrew package:
- # https://github.com/qmk/homebrew-qmk
+ # All macOS & Python dependencies are managed in the Homebrew package:
+ # https://github.com/qmk/homebrew-qmk
brew install qmk/qmk/qmk
- # Conflicts with new toolchain formulae
- brew uninstall --ignore-dependencies arm-gcc-bin@8 >/dev/null 2>&1
-
# Keg-only, so need to be manually linked
brew link --force avr-gcc@8
brew link --force arm-none-eabi-binutils
brew link --force arm-none-eabi-gcc@8
-
- python3 -m pip install -r $QMK_FIRMWARE_DIR/requirements.txt
}
diff --git a/util/usb_detach/usb_detach.c b/util/usb_detach/usb_detach.c
index 786ab5e674..8047c37ba3 100644
--- a/util/usb_detach/usb_detach.c
+++ b/util/usb_detach/usb_detach.c
@@ -31,4 +31,4 @@ int main(int argc, char**argv)
printf ("usage: %s /dev/bus/usb/BUS/DEVICE\n",argv[0]);
printf("Release all interfaces of this usb device for usage in virtualisation\n");
}
-} \ No newline at end of file
+}