From patchwork Mon Aug 20 08:55:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 178705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id CC7F62C009A for ; Mon, 20 Aug 2012 18:56:05 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3913A899B8; Mon, 20 Aug 2012 08:56:00 +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 wEEh9-vyZ3yi; Mon, 20 Aug 2012 08:55:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 32CC289C74; Mon, 20 Aug 2012 08:55:57 +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 1CA2A8F753 for ; Mon, 20 Aug 2012 08:55:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 182B6899B8 for ; Mon, 20 Aug 2012 08:55:46 +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 5+Mua6fHuaym for ; Mon, 20 Aug 2012 08:55:44 +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 1096F89C74 for ; Mon, 20 Aug 2012 08:55:43 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id x43so8166230wey.16 for ; Mon, 20 Aug 2012 01:55:43 -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=nadCJMXtvY/AF8F/c/4urQpwh8d7/PZK/W9wVDIYaVf/LG5VDFqEwa2BeCSSDYFqyn ohLKBMCBOBp/tcE/I3aa8uh1OrMxZ4GO4d3e0anyAlk2Fl+odUkgDrR8+cc4zum6/1Rv yMZx/goAn6qVMzfFJNKOPxuFQErvrh5g+c4Wk6KuZmt3B0FIt+P/VlMS9L/W8+E3yIL0 rmHh3oXHbDBLIjs/gPE73Hw1b1LFnN+00/w/nR6BmNUXenP71H0DMneap16EHQBqOEn0 hm7Pl8jtuLuoOgjuYSh+4Wq22F3xsmdd0cwh5nfKXarlMSri6t1kRn5WCJgXBk8JOVxX aKHQ== Received: by 10.180.81.38 with SMTP id w6mr27145388wix.10.1345452943670; Mon, 20 Aug 2012 01:55:43 -0700 (PDT) Received: from xubuntu-12.04 (78.114.86.79.rev.sfr.net. [79.86.114.78]) by mx.google.com with ESMTPS id dc3sm27015386wib.7.2012.08.20.01.55.42 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Aug 2012 01:55:43 -0700 (PDT) From: Francois Perrad To: buildroot@busybox.net Date: Mon, 20 Aug 2012 10:55:08 +0200 Message-Id: <1345452909-15756-9-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345452909-15756-1-git-send-email-francois.perrad@gadz.org> References: <1345452909-15756-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 09/10] 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))