From patchwork Sat Oct 6 13:53:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 189708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 683B32C020B for ; Sat, 6 Oct 2012 23:55:31 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A4CA7A028F; Sat, 6 Oct 2012 13:55:30 +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 B4ynuadeWqqh; Sat, 6 Oct 2012 13:55:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 440E5A0516; Sat, 6 Oct 2012 13:54:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A72118F74B for ; Sat, 6 Oct 2012 13:54:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 310458306E for ; Sat, 6 Oct 2012 13:54:18 +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 ze217k154EME for ; Sat, 6 Oct 2012 13:54:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id AE66C838A4 for ; Sat, 6 Oct 2012 13:54:15 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id s43so2291837wey.16 for ; Sat, 06 Oct 2012 06:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=hxqoNzGFc0XL48ET39FQMSP6g2amfOrCfXp7OJ+3UyQ=; b=vgHf/BkNBCci0wmiLngiHFwHoZEG1bFnGQwdKbyEVqUalUO8+0ImdRlY4mNJbFaPkC XnlvAFOL5s581tNFOpu9FMYsZtDq5Ad/Iampk/fSZcmekta1gUmnlxRpDokvC5tYQiLs QHvlIMz5iuZERGKWu/1O4eiASyBVGfuXyEoa5afuycmip2xjIJva8mJw4d9TVz9HP0TJ dPErSFe504QHkse/Ua2N9yjzr3m5zb494iCcEdstgQn7lkBKV0bbxM6sjvr51zeUJBPR CQgdXh1WA+D7ZtSYavf6EfMaFcL98doZlkzhqcNv0sEEbYzQO2KfSI05k9L/ELOUnVsf y/Og== Received: by 10.216.204.139 with SMTP id h11mr6964190weo.128.1349531655290; Sat, 06 Oct 2012 06:54:15 -0700 (PDT) Received: from xubuntu-12.04 (95.151.93.79.rev.sfr.net. [79.93.151.95]) by mx.google.com with ESMTPS id cu1sm8327350wib.6.2012.10.06.06.54.13 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 06 Oct 2012 06:54:14 -0700 (PDT) From: Francois Perrad To: buildroot@busybox.net Date: Sat, 6 Oct 2012 15:53:51 +0200 Message-Id: <1349531633-26717-8-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349531633-26717-1-git-send-email-francois.perrad@gadz.org> References: <1349531633-26717-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH v9 08/10] perl: relax microperl dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Francois Perrad --- package/autoconf/Config.in | 2 +- package/autoconf/autoconf.mk | 7 ++++++- package/automake/Config.in | 2 +- package/automake/automake.mk | 7 ++++++- package/ntp/Config.in | 4 ++-- package/samba/Config.in | 4 ++-- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/package/autoconf/Config.in b/package/autoconf/Config.in index 00b3e2c..41866ad 100644 --- a/package/autoconf/Config.in +++ b/package/autoconf/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_AUTOCONF bool "autoconf" - select BR2_PACKAGE_MICROPERL + select BR2_PACKAGE_MICROPERL if !BR2_PACKAGE_PERL help Extensible program for developing configure scripts. These scripts handle all the mundane system/feature detection. diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 3f84e3e..13a474e 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -10,7 +10,12 @@ AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \ ac_cv_prog_gnu_m4_gnu=no -AUTOCONF_DEPENDENCIES = microperl host-m4 +AUTOCONF_DEPENDENCIES = host-m4 +ifeq ($(BR2_PACKAGE_PERL),y) + AUTOCONF_DEPENDENCIES += perl +else + AUTOCONF_DEPENDENCIES += microperl +endif HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \ ac_cv_prog_gnu_m4_gnu=no diff --git a/package/automake/Config.in b/package/automake/Config.in index 935f1f1..c0b29d1 100644 --- a/package/automake/Config.in +++ b/package/automake/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_AUTOMAKE bool "automake" select BR2_PACKAGE_AUTOCONF - select BR2_PACKAGE_MICROPERL + select BR2_PACKAGE_MICROPERL if !BR2_PACKAGE_PERL help Tool for automatically generating Makefile's for input to configure scripts (made by autoconf). diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 3c19085..0766111 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -7,7 +7,12 @@ AUTOMAKE_VERSION = 1.11.5 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake -AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl +AUTOMAKE_DEPENDENCIES = host-autoconf autoconf +ifeq ($(BR2_PACKAGE_PERL),y) + AUTOMAKE_DEPENDENCIES += perl +else + AUTOMAKE_DEPENDENCIES += microperl +endif HOST_AUTOMAKE_DEPENDENCIES = host-autoconf diff --git a/package/ntp/Config.in b/package/ntp/Config.in index 5996596..434cd2d 100644 --- a/package/ntp/Config.in +++ b/package/ntp/Config.in @@ -20,7 +20,7 @@ config BR2_PACKAGE_NTP_NTP_KEYGEN config BR2_PACKAGE_NTP_NTP_WAIT bool "ntp-wait" - depends on BR2_PACKAGE_MICROPERL + depends on BR2_PACKAGE_MICROPERL || BR2_PACKAGE_PERL help ntp-wait waits until the locally running ntpd is in state 4 (synchronized). This could be useful at boot time, to delay the @@ -59,7 +59,7 @@ config BR2_PACKAGE_NTP_NTPSNMPD config BR2_PACKAGE_NTP_NTPTRACE bool "ntptrace" - depends on BR2_PACKAGE_MICROPERL + depends on BR2_PACKAGE_MICROPERL || BR2_PACKAGE_PERL help ntptrace is a perl script that uses the ntpq utility program to follow the chain of NTP servers from a given host back to the diff --git a/package/samba/Config.in b/package/samba/Config.in index e88b360..ee3244f 100644 --- a/package/samba/Config.in +++ b/package/samba/Config.in @@ -36,12 +36,12 @@ config BR2_PACKAGE_SAMBA_FINDSMB default y depends on BR2_PACKAGE_SAMBA_SMBCLIENT depends on BR2_PACKAGE_SAMBA_NMBLOOKUP - depends on BR2_PACKAGE_MICROPERL + depends on BR2_PACKAGE_MICROPERL || BR2_PACKAGE_PERL help Script to browse network comment "findsmb - disabled (requires nmblookup, smbclient and perl)" - depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !BR2_PACKAGE_MICROPERL + depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !(BR2_PACKAGE_MICROPERL || BR2_PACKAGE_PERL) config BR2_PACKAGE_SAMBA_NET bool "net"