From: Samuel Martin Date: Tue, 17 Mar 2015 17:36:36 +0000 (+0100) Subject: package/openocd: depends on libftdi1 instead of libftdi X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9bdf5926;p=buildroot.git package/openocd: depends on libftdi1 instead of libftdi Note that, if both libftdi and libftdi1 are available, openocd will prefer libftdi1, so does Buildroot. ;-) Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- diff --git a/package/openocd/Config.in b/package/openocd/Config.in index 7c140c7d04..2db17fa76a 100644 --- a/package/openocd/Config.in +++ b/package/openocd/Config.in @@ -121,7 +121,7 @@ config BR2_PACKAGE_OPENOCD_PARPORT config BR2_PACKAGE_OPENOCD_FT2XXX bool "FT2232 based devices (DEPRECATED)" - select BR2_PACKAGE_LIBFTDI + select BR2_PACKAGE_LIBFTDI1 depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb depends on BR2_ARCH_HAS_ATOMICS help @@ -135,7 +135,7 @@ config BR2_PACKAGE_OPENOCD_VPI config BR2_PACKAGE_OPENOCD_UBLASTER bool "Altera USB-Blaster" - select BR2_PACKAGE_LIBFTDI + select BR2_PACKAGE_LIBFTDI1 depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb depends on BR2_ARCH_HAS_ATOMICS help @@ -176,7 +176,7 @@ config BR2_PACKAGE_OPENOCD_GW16012 config BR2_PACKAGE_OPENOCD_PRESTO bool "ASIX Presto Programmer" - select BR2_PACKAGE_LIBFTDI + select BR2_PACKAGE_LIBFTDI1 depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb depends on BR2_ARCH_HAS_ATOMICS help @@ -185,7 +185,7 @@ config BR2_PACKAGE_OPENOCD_PRESTO config BR2_PACKAGE_OPENOCD_OPENJTAG bool "OpenJTAG Programmer" - select BR2_PACKAGE_LIBFTDI + select BR2_PACKAGE_LIBFTDI1 depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb depends on BR2_ARCH_HAS_ATOMICS help diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index fd7e09fad6..3b7685061b 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -23,7 +23,7 @@ OPENOCD_CONF_OPTS = \ # the dependencies they need. OPENOCD_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_LIBFTDI),libftdi) \ + $(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \ $(if $(BR2_PACKAGE_LIBUSB),libusb) \ $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ $(if $(BR2_PACKAGE_LIBHID),libhid)