Commit ee2f4138 authored by Romain Naour's avatar Romain Naour Committed by Peter Korsgaard
Browse files

package/openocd: select libusb when selecting libusb-compat 

libusb-compat depends on libusb package, so we need to select
libusb package at the same time as libusb-compat to avoid an
unmet dependency.

Since 28f67899, the build
stop if a package build is trigged at Makefile level without
being selected at Config.in level.

This is the case here with BR2_PACKAGE_OPENOCD_USBPROG which
select BR2_PACKAGE_LIBUSB_COMPAT without selecting
BR2_PACKAGE_LIBUSB.

Fixes:
http://autobuild.buildroot.net/results/b4a/b4a8c54eed6bf75ab8ade0653953d19792155727/



Signed-off-by: default avatarRomain Naour <romain.naour@gmail.com>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent d52deb9a

package/openocd/Config.in

+5 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ config BR2_PACKAGE_OPENOCD_AICE 


config BR2_PACKAGE_OPENOCD_VSLLINK

	bool "Versaloon-Link JTAG Programmer"

	select BR2_PACKAGE_LIBUSB

	select BR2_PACKAGE_LIBUSB_COMPAT

	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb

	help
@@ -92,6 +93,7 @@ config BR2_PACKAGE_OPENOCD_VSLLINK 


config BR2_PACKAGE_OPENOCD_USBPROG

	bool "USBProg JTAG Programmer"

	select BR2_PACKAGE_LIBUSB

	select BR2_PACKAGE_LIBUSB_COMPAT

	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb

	help
@@ -100,6 +102,7 @@ config BR2_PACKAGE_OPENOCD_USBPROG 


config BR2_PACKAGE_OPENOCD_RLINK

	bool "Raisonance RLink JTAG Programmer"

	select BR2_PACKAGE_LIBUSB

	select BR2_PACKAGE_LIBUSB_COMPAT

	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb

	help
@@ -108,6 +111,7 @@ config BR2_PACKAGE_OPENOCD_RLINK 


config BR2_PACKAGE_OPENOCD_ARMEW

	bool "Olimex ARM-JTAG-EW Programmer"

	select BR2_PACKAGE_LIBUSB

	select BR2_PACKAGE_LIBUSB_COMPAT

	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb

	help
@@ -186,6 +190,7 @@ config BR2_PACKAGE_OPENOCD_PRESTO 
config BR2_PACKAGE_OPENOCD_OPENJTAG

	bool "OpenJTAG Programmer"

	select BR2_PACKAGE_LIBFTDI1

	select BR2_PACKAGE_LIBUSB

	select BR2_PACKAGE_LIBUSB_COMPAT # needs usb.h

	depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb

	depends on BR2_ARCH_HAS_ATOMICS