Commit 635555cb authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Peter Korsgaard
Browse files

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: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent e50431b2

package/avrdude/Config.in

+9 −3
Original line number Diff line number Diff line 
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

package/avrdude/avrdude.mk

+1 −1
Original line number Diff line number Diff line
@@ -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