From patchwork Mon Aug 20 08:55:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 178708 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 480102C008A for ; Mon, 20 Aug 2012 18:56:28 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8FC478A30A; Mon, 20 Aug 2012 08:56:21 +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 jOSxSBxljeLb; Mon, 20 Aug 2012 08:56:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A6B3C8BF91; Mon, 20 Aug 2012 08:56:14 +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 C4E688F753 for ; Mon, 20 Aug 2012 08:55:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BCA6789C74 for ; Mon, 20 Aug 2012 08:55: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 pMpIQR0npD7B for ; Mon, 20 Aug 2012 08:55:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2C850899B8 for ; Mon, 20 Aug 2012 08:55:46 +0000 (UTC) Received: by wibhm2 with SMTP id hm2so2693724wib.10 for ; Mon, 20 Aug 2012 01:55: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=e81Xg1GR3l937uJEkvILUOMR8DN7Qp9IWtr5n4TY4SQ=; b=MA+LkhydSUj/qh+gwnrwmVGXtG8te8rX6T2APiSDXo4VjesoxgIL9nj3Gb5fqk8arU DQcjT9IsUPwO99xypvSrm2pJJuuHfHGHQfidQtg5nNWGWA0Bq5ea+KIs2n0J13D4L6S4 7XRCbTr3RrPzyQBdie2HMmQiE3FFNfJycs8NZvE2nhFbccKKY2UWnch9DfZoTRrsWg5Z vEjIr7pkQhXjhylq2qZ36sRkg7jdF3FlVxDV3/CUlyIxLlgcr+kS/X3dQWtxwRHtanSv MAXoNh64jsYnonry7iUOXXOaJaQor9Wo+2UwVGGlR1Do5HXh3eHwZsa4F7AxOG5k54zH VGOw== Received: by 10.180.91.169 with SMTP id cf9mr32088081wib.1.1345452945318; Mon, 20 Aug 2012 01:55:45 -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.43 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Aug 2012 01:55:44 -0700 (PDT) From: Francois Perrad To: buildroot@busybox.net Date: Mon, 20 Aug 2012 10:55:09 +0200 Message-Id: <1345452909-15756-10-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 10/10] microperl: compatible with cpanminus 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 --- package/Config.in | 2 +- package/microperl/microperl.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/Config.in b/package/Config.in index bb8c80d..986fc89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -263,7 +263,7 @@ source "package/xavante/Config.in" endmenu endif source "package/perl/Config.in" -if BR2_PACKAGE_PERL || BR2_PACKAGE_MINIPERL +if BR2_PACKAGE_PERL || BR2_PACKAGE_MINIPERL || BR2_PACKAGE_MICROPERL menu "Perl libraries/modules" source "package/cpanminus/Config.in" endmenu diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk index a3d1018..f512fae 100644 --- a/package/microperl/microperl.mk +++ b/package/microperl/microperl.mk @@ -108,11 +108,15 @@ define MICROPERL_CONFIGURE_CMDS $(SED) '/^archlib=/d' -e '/^archlibexp=/d' -e '/^optimize=/d' \ -e '/^archname=/d' -e '/^d_poll=/d' -e '/^i_poll=/d' \ -e '/^osname=/d' -e '/^d_archlib=/d' -e '/^i_fcntl=/d' \ + -e '/^sitelib=/d' -e '/^sitelibexp=/d' \ -e '/^useperlio=/d' $(MICROPERL_UCONFIG_SH) $(SED) 's/5\.$(MICROPERL_VERSION_MAJOR)/$(MICROPERL_VERSION)/' $(MICROPERL_UCONFIG_SH) + $(SED) 's/local\///' $(MICROPERL_UCONFIG_SH) echo "archlib='$(MICROPERL_ARCH_DIR)'" >>$(MICROPERL_UCONFIG_SH) echo "archlibexp='$(MICROPERL_ARCH_DIR)'" >>$(MICROPERL_UCONFIG_SH) echo "d_archlib='define'" >>$(MICROPERL_UCONFIG_SH) + echo "sitelib='/usr/local/lib/perl5'" >>$(MICROPERL_UCONFIG_SH) + echo "sitelibexp='/usr/local/lib/perl5'" >>$(MICROPERL_UCONFIG_SH) echo "archname='$(GNU_TARGET_NAME)'" >>$(MICROPERL_UCONFIG_SH) echo "osname='linux'" >>$(MICROPERL_UCONFIG_SH) echo "cc='$(TARGET_CC)'" >>$(MICROPERL_UCONFIG_SH) @@ -126,7 +130,6 @@ define MICROPERL_CONFIGURE_CMDS $(MICROPERL_BIGENDIAN) $(MICROPERL_LARGEFILE) $(MICROPERL_WCHAR) - $(SED) 's/local\///' $(MICROPERL_UCONFIG_SH) $(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h $(MICROPERL_REGEN_CONFIG) cp -f $(@D)/uconfig.h $(@D)/config.h