From 635555cbd9d135eedbfc9ac23ee02f37e7d3de00 Mon Sep 17 00:00:00 2001 From: Gregory CLEMENT Date: Thu, 28 Aug 2014 14:21:32 +0200 Subject: [PATCH] avrdude: Depend on elfutils instead of libelf to get the libelf library The elfutils package provides a more recent version of the libelf, so let's use it. It will allow to remove the libelf package and to avoid conflicts with two packages providing the same library. [Peter: adjust toolchain options comment to match] Signed-off-by: Gregory CLEMENT Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/avrdude/Config.in | 12 +++++++++--- package/avrdude/avrdude.mk | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in index 8eac014a3..7d9f5eb74 100644 --- a/package/avrdude/Config.in +++ b/package/avrdude/Config.in @@ -1,15 +1,21 @@ config BR2_PACKAGE_AVRDUDE bool "avrdude" - select BR2_PACKAGE_LIBELF + select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT select BR2_PACKAGE_NCURSES depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_LARGEFILE # elfutils + depends on BR2_USE_WCHAR # elfutils + depends on !BR2_avr32 # elfutils + depends on !BR2_bfin # elfutils help avrdude is a programmer for Atmel AVR microcontrollers this package provides a version with new linuxspi driver https://github.com/kcuzner/avrdude -comment "avrdude needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "avrdude needs a toolchain w/ threads, largefile, wchar" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || !BR2_USE_WCHAR + depends on !BR2_avr32 + depends on !BR2_bfin diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk index 7876c1d6c..03d6490de 100644 --- a/package/avrdude/avrdude.mk +++ b/package/avrdude/avrdude.mk @@ -12,7 +12,7 @@ AVRDUDE_SUBDIR = avrdude # Sources coming from git, without generated configure and Makefile.in # files. AVRDUDE_AUTORECONF = YES -AVRDUDE_DEPENDENCIES = libelf libusb libusb-compat ncurses \ +AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ host-flex host-bison AVRDUDE_LICENSE = GPLv2+ AVRDUDE_LICENSE_FILES = avrdude/COPYING