From patchwork Thu Aug 23 08:14:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 179560 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 988A42C0096 for ; Thu, 23 Aug 2012 18:15:38 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 99EA7A0540; Thu, 23 Aug 2012 08:15:36 +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 qFlIBxd9x4yL; Thu, 23 Aug 2012 08:15:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AAE7DA051A; Thu, 23 Aug 2012 08:15:02 +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 B0FF18F753 for ; Thu, 23 Aug 2012 08:14:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A1E4E8F69F for ; Thu, 23 Aug 2012 08:14:48 +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 LQaxSxKqwA2H for ; Thu, 23 Aug 2012 08:14:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 800458F699 for ; Thu, 23 Aug 2012 08:14:47 +0000 (UTC) Received: by wibhm2 with SMTP id hm2so281862wib.4 for ; Thu, 23 Aug 2012 01:14:45 -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=U60nlhiVY8zt5sARemi4CxmNbH4p0ZPugC9Y8xKlDME=; b=SdG1pw1+tZapkagE5tXvVGev6BplrGM9dNOY9dVgILIUtAfh2mLAyMFEfHX5HMYEjK pa6XSMgR9gR16+d8yWEfcyxPBHoPpIlSVtUg66twgMZDiWu6VmP4ZTnpT8SEoGWRba1w jB2UXIXHatlhhCn7rckCrkrtAVTmegUHFvszUXPKBPf8mB3UOjI1RLsCD0/bV6kHgJxX u+/lx62iAeWgiEpp18x4jq8+53u26BAG0OngSN4cyrugbU/1z25sgc4Hf8Y+tZ87WkJR uH3e4q1z3i5eKymXapr8izN/2D/lyG55wWKVqmICgFwBO98YREfJMaeU2dbWDEPkOfxT ZaPA== Received: by 10.180.74.33 with SMTP id q1mr12914314wiv.4.1345709685779; Thu, 23 Aug 2012 01:14:45 -0700 (PDT) Received: from xubuntu-12.04 (113.120.86.79.rev.sfr.net. [79.86.120.113]) by mx.google.com with ESMTPS id q4sm43651163wix.9.2012.08.23.01.14.43 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Aug 2012 01:14:45 -0700 (PDT) From: Francois Perrad To: buildroot@busybox.net Date: Thu, 23 Aug 2012 10:14:20 +0200 Message-Id: <1345709660-25443-9-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345709660-25443-1-git-send-email-francois.perrad@gadz.org> References: <1345709660-25443-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 9/9] microperl: remove host-microperl 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/microperl/microperl.mk | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk index b601754..a3d1018 100644 --- a/package/microperl/microperl.mk +++ b/package/microperl/microperl.mk @@ -10,7 +10,7 @@ MICROPERL_SITE = http://www.cpan.org/src/5.0 MICROPERL_SOURCE = perl-$(MICROPERL_VERSION).tar.bz2 MICROPERL_LICENSE = Artistic MICROPERL_LICENSE_FILES = Artistic -MICROPERL_DEPENDENCIES = host-microperl +MICROPERL_DEPENDENCIES = host-perl MICROPERL_MODS_DIR = /usr/lib/perl5/$(MICROPERL_VERSION) MICROPERL_ARCH_DIR = $(MICROPERL_MODS_DIR)/$(GNU_TARGET_NAME) MICROPERL_MODS = $(call qstrip,$(BR2_PACKAGE_MICROPERL_MODULES)) @@ -79,21 +79,6 @@ ifeq ($(BR2_PACKAGE_MICROPERL_BUNDLE_CGI),y) MICROPERL_MODS += CGI CGI.pm endif -# Host microperl is actually full-blown perl -define HOST_MICROPERL_CONFIGURE_CMDS - cd $(@D) ; \ - ./Configure -Dcc="$(HOSTCC)" -Dprefix="$(HOST_DIR)/usr" \ - -Dloclibpth='/lib /lib64 /usr/lib /usr/lib64' -des -endef - -define HOST_MICROPERL_BUILD_CMDS - $(MAKE) -C $(@D) -endef - -define HOST_MICROPERL_INSTALL_CMDS - $(MAKE) -C $(@D) install -endef - ifeq ($(BR2_ENDIAN),"BIG") define MICROPERL_BIGENDIAN $(SED) '/^byteorder=/d' $(MICROPERL_UCONFIG_SH) @@ -149,8 +134,8 @@ define MICROPERL_CONFIGURE_CMDS echo "ccname='$(TARGET_CC)'" >>$(@D)/config.sh echo "PERL_CONFIG_SH=true" >>$(@D)/config.sh touch $(@D)/config.h # avoid warning : out of date - cd $(@D) ; $(HOST_DIR)/usr/bin/perl make_patchnum.pl ; \ - $(HOST_DIR)/usr/bin/perl configpm + cd $(@D) ; $(HOST_DIR)/usr/bin/perl$(PERL_VERSION) make_patchnum.pl ; \ + $(HOST_DIR)/usr/bin/perl$(PERL_VERSION) configpm endef define MICROPERL_BUILD_CMDS @@ -165,7 +150,7 @@ endef # We try to build anyway to avoid a huge black list # Just ignore make_ext.pl warning/errors define MICROPERL_BUILD_EXTENSIONS - cd $(@D); rm -f miniperl; ln -s $(HOST_DIR)/usr/bin/perl miniperl; + cd $(@D); rm -f miniperl; ln -s $(HOST_DIR)/usr/bin/perl$(PERL_VERSION) miniperl; for i in $(MICROPERL_MODS); do \ cd $(@D); PERL5LIB=lib \ ./miniperl make_ext.pl MAKE="$(MAKE)" --nonxs \ @@ -205,4 +190,3 @@ define MICROPERL_UNINSTALL_TARGET_CMDS endef $(eval $(generic-package)) -$(eval $(host-generic-package))