diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-02-28 18:26:10 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-02-28 18:49:52 +0100 |
commit | c82abed2a7e36fd88b786febfa49d426643ef6e2 (patch) | |
tree | 328582295b90209a9161fae02532c0be83872c9c /rules | |
parent | dca5956e95d44a2d9d63763ff349768f1a830953 (diff) | |
download | ptxdist-c82abed2a7e36fd88b786febfa49d426643ef6e2.tar.gz ptxdist-c82abed2a7e36fd88b786febfa49d426643ef6e2.tar.xz |
dfu-util: make sure libusb is handled correctly
The real libusb is used now. Set ac_cv_lib_usb_libusb_init=no
to make sure a libusb-compat won't confuse the configure script.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r-- | rules/dfu-util.in | 2 | ||||
-rw-r--r-- | rules/dfu-util.make | 7 | ||||
-rw-r--r-- | rules/host-dfu-util.in | 1 | ||||
-rw-r--r-- | rules/host-dfu-util.make | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/rules/dfu-util.in b/rules/dfu-util.in index 0e3e4fb24..ac95f06a7 100644 --- a/rules/dfu-util.in +++ b/rules/dfu-util.in @@ -2,7 +2,7 @@ config DFU_UTIL tristate - select LIBUSB_COMPAT + select LIBUSB prompt "dfu-util" help dfu-util is a program that implements the host (PC) side of diff --git a/rules/dfu-util.make b/rules/dfu-util.make index 1470e4229..85488f4d2 100644 --- a/rules/dfu-util.make +++ b/rules/dfu-util.make @@ -29,13 +29,14 @@ DFU_UTIL_LICENSE := GPLv2 # Prepare # ---------------------------------------------------------------------------- -DFU_UTIL_PATH := PATH=$(CROSS_PATH) -DFU_UTIL_ENV := $(CROSS_ENV) +DFU_UTIL_CONF_ENV := \ + $(CROSS_ENV) \ + ac_cv_lib_usb_libusb_init=no # # autoconf # -DFU_UTIL_AUTOCONF := $(CROSS_AUTOCONF_USR) +DFU_UTIL_CONF_TOOL := autoconf # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/host-dfu-util.in b/rules/host-dfu-util.in index 7dfd42fec..602ffe203 100644 --- a/rules/host-dfu-util.in +++ b/rules/host-dfu-util.in @@ -2,6 +2,7 @@ config HOST_DFU_UTIL tristate + select HOST_LIBUSB prompt "dfu-util" help dfu-util is the host side implementation of the DFU 1.0 and DFU 1.1 diff --git a/rules/host-dfu-util.make b/rules/host-dfu-util.make index 2a8f648f5..31225d89d 100644 --- a/rules/host-dfu-util.make +++ b/rules/host-dfu-util.make @@ -17,6 +17,10 @@ HOST_PACKAGES-$(PTXCONF_HOST_DFU_UTIL) += host-dfu-util # Prepare # ---------------------------------------------------------------------------- +HOST_DFU_UTIL_CONF_ENV := \ + $(HOST_ENV) \ + ac_cv_lib_usb_libusb_init=no + # # autoconf # |