axel: convert to gentargets and bump to 2.4
[Peter: fix build with locale, pass LDFLAGS, simplify install] Signed-off-by: Martin Banky <Martin.Banky@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
f09275968c
commit
0f9da87c1d
4
CHANGES
4
CHANGES
@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
New packages: xz
|
New packages: xz
|
||||||
|
|
||||||
Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,
|
Updated/fixed packages: alsa-lib, at, avahi, axel, berkeleydb,
|
||||||
bmon, boa, bridge-utils, bsdiff, busybox, dbus, dmraid,
|
bind, bmon, boa, bridge-utils, bsdiff, busybox, dbus, dmraid,
|
||||||
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
|
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
|
||||||
freetype, gawk, gvfs, haserl, hostapd, hwdata, ifplugd, iperf,
|
freetype, gawk, gvfs, haserl, hostapd, hwdata, ifplugd, iperf,
|
||||||
iproute2, iptables, jpeg, kexec, kismet, less, libcurl,
|
iproute2, iptables, jpeg, kexec, kismet, less, libcurl,
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
config BR2_PACKAGE_AXEL
|
config BR2_PACKAGE_AXEL
|
||||||
bool "axel"
|
bool "axel"
|
||||||
|
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||||
|
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||||
help
|
help
|
||||||
HTTP/FTP download accelerator.
|
HTTP/FTP download accelerator.
|
||||||
|
|
||||||
|
@ -3,53 +3,45 @@
|
|||||||
# axel
|
# axel
|
||||||
#
|
#
|
||||||
#############################################################
|
#############################################################
|
||||||
AXEL_VERSION:=1.1
|
AXEL_VERSION = 2.4
|
||||||
AXEL_SOURCE:=axel-$(AXEL_VERSION).tar.gz
|
AXEL_SOURCE = axel-$(AXEL_VERSION).tar.gz
|
||||||
AXEL_SITE:=http://alioth.debian.org/frs/download.php/2287
|
AXEL_SITE = https://alioth.debian.org/frs/download.php/3015
|
||||||
AXEL_CAT:=$(ZCAT)
|
|
||||||
AXEL_DIR:=$(BUILD_DIR)/axel-$(AXEL_VERSION)
|
|
||||||
AXEL_BINARY:=axel
|
|
||||||
AXEL_TARGET_BINARY:=usr/bin/axel
|
|
||||||
|
|
||||||
$(DL_DIR)/$(AXEL_SOURCE):
|
AXEL_LDFLAGS = -lpthread
|
||||||
$(call DOWNLOAD,$(AXEL_SITE),$(AXEL_SOURCE))
|
|
||||||
|
|
||||||
axel-source: $(DL_DIR)/$(AXEL_SOURCE)
|
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
||||||
|
AXEL_DEPENDENCIES += gettext libintl
|
||||||
|
AXEL_LDFLAGS += -lintl
|
||||||
|
endif
|
||||||
|
|
||||||
$(AXEL_DIR)/.unpacked: $(DL_DIR)/$(AXEL_SOURCE)
|
ifneq ($(BR2_ENABLE_LOCALE),y)
|
||||||
$(AXEL_CAT) $(DL_DIR)/$(AXEL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
AXEL_DISABLE_I18N=--i18n=0
|
||||||
#toolchain/patch-kernel.sh $(AXEL_DIR) package/axel axel\*.patch
|
endif
|
||||||
touch $@
|
|
||||||
|
|
||||||
$(AXEL_DIR)/Makefile.settings: $(AXEL_DIR)/.unpacked
|
define AXEL_CONFIGURE_CMDS
|
||||||
(cd $(AXEL_DIR); \
|
(cd $(@D); \
|
||||||
./configure --i18n=0 --prefix=/usr \
|
./configure \
|
||||||
|
--prefix=/usr \
|
||||||
|
--debug=1 \
|
||||||
|
$(AXEL_DISABLE_I18N) \
|
||||||
)
|
)
|
||||||
touch $@
|
endef
|
||||||
|
|
||||||
$(AXEL_DIR)/$(AXEL_BINARY): $(AXEL_DIR)/Makefile.settings
|
define AXEL_BUILD_CMDS
|
||||||
$(MAKE) CC="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" -C $(AXEL_DIR)
|
$(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
|
||||||
|
LFLAGS="$(TARGET_LDFLAGS) $(AXEL_LDFLAGS)" -C $(@D)
|
||||||
|
endef
|
||||||
|
|
||||||
$(TARGET_DIR)/$(AXEL_TARGET_BINARY): $(AXEL_DIR)/$(AXEL_BINARY)
|
define AXEL_INSTALL_TARGET_CMDS
|
||||||
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-bin
|
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
|
||||||
ifeq ($(BR2_HAVE_DOCUMENTATION),y)
|
endef
|
||||||
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-man
|
|
||||||
endif
|
|
||||||
|
|
||||||
axel: $(TARGET_DIR)/$(AXEL_TARGET_BINARY)
|
define AXEL_UNINSTALL_TARGET_CMDS
|
||||||
|
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
|
||||||
|
endef
|
||||||
|
|
||||||
axel-clean:
|
define AXEL_CLEAN_CMDS
|
||||||
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) uninstall
|
-$(MAKE) -C $(@D) clean
|
||||||
-$(MAKE) -C $(AXEL_DIR) clean
|
endef
|
||||||
|
|
||||||
axel-dirclean:
|
$(eval $(call GENTARGETS,package,axel))
|
||||||
rm -rf $(AXEL_DIR)
|
|
||||||
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Toplevel Makefile options
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
ifeq ($(BR2_PACKAGE_AXEL),y)
|
|
||||||
TARGETS+=axel
|
|
||||||
endif
|
|
||||||
|
Loading…
Reference in New Issue
Block a user