From patchwork Sat Nov 25 04:44:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ismael Luceno X-Patchwork-Id: 841209 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ykLlX2vbSz9s7F for ; Sat, 25 Nov 2017 16:12:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 70E8788EA9; Sat, 25 Nov 2017 05:12:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T3IFyiGI5cpN; Sat, 25 Nov 2017 05:12:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 66BD1869BF; Sat, 25 Nov 2017 05:12:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3B9281C0621 for ; Sat, 25 Nov 2017 04:45:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 33E0B88F6F for ; Sat, 25 Nov 2017 04:45:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JKrz68EXjkKs for ; Sat, 25 Nov 2017 04:45:07 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from iodev.co.uk (iodev.co.uk [82.211.30.53]) by whitealder.osuosl.org (Postfix) with ESMTP id E557D88F52 for ; Sat, 25 Nov 2017 04:45:06 +0000 (UTC) From: Ismael Luceno To: buildroot@buildroot.org Date: Sat, 25 Nov 2017 01:44:47 -0300 Message-Id: <20171125044447.7188-1-ismael@iodev.co.uk> X-Mailer: git-send-email 2.15.0 Subject: [Buildroot] [PATCH] axel: bump to version 2.16 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Ismael Luceno MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Change upstream URL. - Add optional dependency on libressl/openssl. - Switch to autotools-package. Signed-off-by: Ismael Luceno --- package/axel/Config.in | 2 +- package/axel/axel.hash | 3 +-- package/axel/axel.mk | 42 ++++++++++++++++++------------------------ 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/package/axel/Config.in b/package/axel/Config.in index 6e709cfb1351..4507855ff8e7 100644 --- a/package/axel/Config.in +++ b/package/axel/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_AXEL help HTTP/FTP download accelerator. - http://axel.alioth.debian.org/ + https://github.com/axel-download-accelerator/axel/ comment "axel needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/axel/axel.hash b/package/axel/axel.hash index 895767011892..1fc1c55ae07d 100644 --- a/package/axel/axel.hash +++ b/package/axel/axel.hash @@ -1,2 +1 @@ -# Locally calculated -sha256 359a57ab4e354bcb6075430d977c59d33eb3e2f1415a811948fa8ae657ca8036 axel-2.4.tar.gz +sha256 bd65f8d8add34ab61ce1fb9e1c7b1c3449b1cfd981ce48aeee218e755ba0d6fb axel-2.16.tar.xz diff --git a/package/axel/axel.mk b/package/axel/axel.mk index 60bf5e4a61df..dcc8afd0b4a0 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -4,33 +4,27 @@ # ################################################################################ -AXEL_VERSION = 2.4 -AXEL_SITE = http://sources.buildroot.net +AXEL_VERSION = 2.16 +AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION) +AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ AXEL_LICENSE_FILES = COPYING AXEL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -AXEL_LDFLAGS = -lpthread $(TARGET_NLS_LIBS) -ifeq ($(BR2_SYSTEM_ENABLE_NLS),) -AXEL_DISABLE_I18N = --i18n=0 -endif - -define AXEL_CONFIGURE_CMDS - (cd $(@D); \ - ./configure \ - --prefix=/usr \ - --debug=1 \ - $(AXEL_DISABLE_I18N) \ - ) -endef +# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test +# provided by autoconf relies on wchar_t. +AXEL_CONF_OPTS = \ + ac_cv_prog_cc_c99=-std=c99 \ + CFLAGS="$(TARGET_CFLAGS)" -define AXEL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - LFLAGS="$(TARGET_LDFLAGS) $(AXEL_LDFLAGS)" -C $(@D) -endef - -define AXEL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install -endef +ifeq ($(BR2_PACKAGE_LIBRESSL),y) +AXEL_CONF_OPTS += --with-ssl +AXEL_DEPENDENCIES += libressl +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +AXEL_CONF_OPTS += --with-ssl +AXEL_DEPENDENCIES += openssl +else +AXEL_CONF_OPTS += --without-ssl +endif -$(eval $(generic-package)) +$(eval $(autotools-package))