From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Thu, 19 Mar 2015 00:58:31 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1 In-Reply-To: <1426613796-4921-1-git-send-email-s.martin49@gmail.com> References: <1426613796-4921-1-git-send-email-s.martin49@gmail.com> Message-ID: <550A1127.4080701@mind.be> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 17/03/15 18:36, Samuel Martin wrote: > Avrdude supports both libftdi and libftdi1. > > Because libftdi is already an optional dependency, this patch adds > libftdi1 as optional dependency as well, but privileges libftdi1 over > libftdi (accdording to what is done in avrdude's configure script). > > Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Regards, Arnout > > --- > changes v2->v3: > - rebase > - re-introduce optional libftdi dependency (ThomasP) > - reword commit log > > changes v1->v2: > - rebase > --- > package/avrdude/avrdude.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > index 03d6490..1811893 100644 > --- a/package/avrdude/avrdude.mk > +++ b/package/avrdude/avrdude.mk > @@ -17,7 +17,9 @@ AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ > AVRDUDE_LICENSE = GPLv2+ > AVRDUDE_LICENSE_FILES = avrdude/COPYING > > -ifeq ($(BR2_PACKAGE_LIBFTDI),y) > +ifeq ($(BR2_PACKAGE_LIBFTDI1),y) > +AVRDUDE_DEPENDENCIES += libftdi1 > +else ifeq ($(BR2_PACKAGE_LIBFTDI),y) > AVRDUDE_DEPENDENCIES += libftdi > endif > > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F