From patchwork Tue Jan 19 17:53:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1428766 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=g8vKND/J; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKxB744nfz9sVS for ; Wed, 20 Jan 2021 04:54:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E7D7D86FAF; Tue, 19 Jan 2021 17:54:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wkKKndfXEk2K; Tue, 19 Jan 2021 17:54:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6461C86FB5; Tue, 19 Jan 2021 17:54:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id BF3BA1BF9B2 for ; Tue, 19 Jan 2021 17:54:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B9C8986FB5 for ; Tue, 19 Jan 2021 17:54:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id keZNeV3zIZsZ for ; Tue, 19 Jan 2021 17:54:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5C40B86FAF for ; Tue, 19 Jan 2021 17:54:33 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id c127so539659wmf.5 for ; Tue, 19 Jan 2021 09:54:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oMnjEqShXmfSPeR6nNmLOZl/ViiunwolYi9x8l7kSy0=; b=g8vKND/Jbha4z3G4xzTl2iiLac/DkRrzxrWGiFtD2XofdqartLyEqNInMhtUhggtJn 6qfpOEp1fbeoTlz1kbLglVw4GQDGm4hUPjFw5xW287Ns2iiLfixU2gnoIxX7kfqLoSoQ SE2MJ7oJF63iTqRLDstybxunSeyXG+UOiLVxVOk4sksMH5JAev8xaJoC+ZoCwuvaT3XY c/4vAys2SN+I8TRhi7bvt0pjkV2jWdy5A4VbCarKDGRwlEPQQdwLQrf7HJtJFDHgybrO HpVsIlEb5BwDaBRejLwxg6nzX8eGkVzi1L7kyydA/e9Ya5SsBpM8OH20+UN6MvLTBQR+ Zicw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oMnjEqShXmfSPeR6nNmLOZl/ViiunwolYi9x8l7kSy0=; b=A8GLsdj1corIuthQLVTrUHy/q9Rso6TLnCtBR77SG9ws+S9Y9yMrXnUgCj5EQ1EuuM /7Z3D5uCf9TYqozBlPeoncC5EXD1hyx14H3eO+fVJ8A2A3kXkI0M2xHvL9ziOrzSnhjo wNiDVRJP8/vGwOpNFa0L4DxACslEJNdIqSkqa0UmiZAbKY+sxpWVdUjAbinDAwioZiyE jwonPADJ1Jjw3BAwI48w9j2geglku8S6LBnoOEuKpdg2/gCwaZQYuv7MBSRSOAZXXHYp ISXqh6OXotnBnGsu7jXnU4uDKPN8gsu8iM7lBJoWnZMKh6FGmco/F7GX3kiNPstVdbp5 fqmg== X-Gm-Message-State: AOAM5306E7CvDkqMjODNBTyOMD+Ej9mg0kQmHEvwL7hX8Yyyn7eAFUdH rWCN5p20ccp91ZGalZGh4SlrCQ6R7UKQaw== X-Google-Smtp-Source: ABdhPJyzQOu4jVEhUGKaapLSGZKl/58LG7Z7VuN9lIXXHE7RjX6hdPRGwQFOsowZO4LamG27oMQU6Q== X-Received: by 2002:a7b:c31a:: with SMTP id k26mr742131wmj.72.1611078871550; Tue, 19 Jan 2021 09:54:31 -0800 (PST) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id g18sm30917900wrw.61.2021.01.19.09.54.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 09:54:31 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 19 Jan 2021 18:53:26 +0100 Message-Id: <20210119175326.497192-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119175326.497192-1-fontaine.fabrice@gmail.com> References: <20210119175326.497192-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/nano: fix tiny build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since upstream commit https://git.savannah.gnu.org/cgit/nano.git/commit/configure.ac?id=235f92ce093099cd81f14827ab842bd331132790 --enable-color --enable-nanorc are needed for libmagic support in tiny builds however as --enable-color needs fork() and tiny is selected when !BR2_USE_MMU, it is easier to just disable libmagic with tiny builds Fixes: - http://autobuild.buildroot.net/results/24894e62d6cf89d078959b12e67596c821d64696 Signed-off-by: Fabrice Fontaine --- package/nano/nano.mk | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/package/nano/nano.mk b/package/nano/nano.mk index c688ff216c..af6e1d62de 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -19,18 +19,16 @@ NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false NANO_MAKE_ENV += CURSES_LIB="-lncurses" endif -ifeq ($(BR2_PACKAGE_FILE),y) -NANO_DEPENDENCIES += file -NANO_CONF_OPTS += --enable-libmagic -else -NANO_CONF_OPTS += --disable-libmagic -endif - ifeq ($(BR2_PACKAGE_NANO_TINY),y) NANO_CONF_OPTS += --enable-tiny define NANO_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano endef +else ifeq ($(BR2_PACKAGE_FILE),y) +NANO_DEPENDENCIES += file +NANO_CONF_OPTS += --enable-libmagic +else +NANO_CONF_OPTS += --disable-libmagic endif $(eval $(autotools-package))