From patchwork Sat Sep 1 07:25:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 181114 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 5D7032C0085 for ; Sat, 1 Sep 2012 17:27:08 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B142B10B885; Sat, 1 Sep 2012 07:27:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vdrCpks5FF1w; Sat, 1 Sep 2012 07:27:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A189710B8A1; Sat, 1 Sep 2012 07:26:06 +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 E90A58F75E for ; Sat, 1 Sep 2012 07:26:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 693C28ABF2 for ; Sat, 1 Sep 2012 07:26:01 +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 sUdygNf9ACOs for ; Sat, 1 Sep 2012 07:26:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2416B8ABB1 for ; Sat, 1 Sep 2012 07:25:59 +0000 (UTC) Received: by wibhm2 with SMTP id hm2so1725762wib.10 for ; Sat, 01 Sep 2012 00:25:58 -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=Cdgn86gGQz9hfV8B83a/Qm51GQN36ofyLopW17YmtCA=; b=xyoYr0CFcSk1Jqm3wywVuJtQT5p2kwTS9YqgG1Ah956AWnXHNM3LJWmEP6ZmRi0rMw D5JfE77XakWogQIzuMj/EYfYJcMy6xrKwipqKUcPc7Jc8QG4aM5X3ptowuTqRNT/7X82 0Ywnd2R+eW1hDKFU1XINHxZlBIrP9rYquXvy357Urmv36pEdGLdwjJznOo88VJZrchS5 YyUaqP5qD1gHGsH7PlNDo3y1dnNhwngIKg08jNhrOh2+SLm+WzuMf3UfViYHjNQgV7yH HTdIWi8IbYtsnuj2ubd9TqZNVPu29/K260sr58pXLS0QHQ/EEn/AFEzQTpg17w3JHu/P b0Pg== Received: by 10.180.99.196 with SMTP id es4mr9630049wib.18.1346484358417; Sat, 01 Sep 2012 00:25:58 -0700 (PDT) Received: from xubuntu-12.04 (135.135.193.77.rev.sfr.net. [77.193.135.135]) by mx.google.com with ESMTPS id o2sm7878598wiz.11.2012.09.01.00.25.56 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 01 Sep 2012 00:25:57 -0700 (PDT) From: Francois Perrad To: buildroot@busybox.net Date: Sat, 1 Sep 2012 09:25:24 +0200 Message-Id: <1346484332-31433-6-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346484332-31433-1-git-send-email-francois.perrad@gadz.org> References: <1346484332-31433-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 06/14] microperl: improve configure step on 64bits platform 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 use uconfig64.sh instead of uconfig.sh Signed-off-by: Francois Perrad --- package/microperl/microperl.mk | 74 ++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk index 1899e03..4b68567 100644 --- a/package/microperl/microperl.mk +++ b/package/microperl/microperl.mk @@ -15,6 +15,18 @@ 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)) +ifeq ($(BR2_ARCH_IS_64),y) +MICROPERL_UCONFIG_SH = $(@D)/uconfig64.sh +define MICROPERL_REGEN_CONFIG + $(MAKE) -C $(@D) -f Makefile.micro regen_uconfig64 +endef +else +MICROPERL_UCONFIG_SH = $(@D)/uconfig.sh +define MICROPERL_REGEN_CONFIG + $(MAKE) -C $(@D) -f Makefile.micro regen_uconfig +endef +endif + # Minimal set of modules required for 'perl -V' to work MICROPERL_ARCH_MODS = Config.pm Config_git.pl Config_heavy.pl MICROPERL_BASE_MODS = strict.pm vars.pm warnings.pm warnings/register.pm @@ -41,60 +53,56 @@ endef ifeq ($(BR2_ENDIAN),"BIG") define MICROPERL_BIGENDIAN - $(SED) '/^byteorder=/d' $(@D)/uconfig.sh - echo "byteorder='4321'" >>$(@D)/uconfig.sh + $(SED) '/^byteorder=/d' $(MICROPERL_UCONFIG_SH) + echo "byteorder='4321'" >>$(MICROPERL_UCONFIG_SH) endef endif ifeq ($(BR2_LARGEFILE),y) define MICROPERL_LARGEFILE - $(SED) '/^uselargefiles=/d' $(@D)/uconfig.sh - echo "uselargefiles='define'" >>$(@D)/uconfig.sh + $(SED) '/^uselargefiles=/d' $(MICROPERL_UCONFIG_SH) + echo "uselargefiles='define'" >>$(MICROPERL_UCONFIG_SH) endef endif ifeq ($(BR2_USE_WCHAR),y) define MICROPERL_WCHAR $(SED) '/^d_mbstowcs=/d' -e '/^d_mbtowc=/d' -e '/^d_wcstombs=/d' \ - -e '/^d_wctomb=/d' $(@D)/uconfig.sh - echo "d_mbstowcs='define'" >>$(@D)/uconfig.sh - echo "d_mbtowc='define'" >>$(@D)/uconfig.sh - echo "d_wcstombs='define'" >>$(@D)/uconfig.sh - echo "d_wctomb='define'" >>$(@D)/uconfig.sh + -e '/^d_wctomb=/d' $(MICROPERL_UCONFIG_SH) + echo "d_mbstowcs='define'" >>$(MICROPERL_UCONFIG_SH) + echo "d_mbtowc='define'" >>$(MICROPERL_UCONFIG_SH) + echo "d_wcstombs='define'" >>$(MICROPERL_UCONFIG_SH) + echo "d_wctomb='define'" >>$(MICROPERL_UCONFIG_SH) endef endif 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 '/^u32type=/d' -e '/^d_archlib=/d' \ - -e '/^d_memset=/d' -e '/^i_fcntl=/d' -e '/^useperlio=/d' \ - -e '/^need_va_copy=/d' $(@D)/uconfig.sh - $(SED) 's/5\.$(MICROPERL_VERSION_MAJOR)/$(MICROPERL_VERSION)/' $(@D)/uconfig.sh - echo "archlib='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh - echo "archlibexp='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh - echo "d_archlib='define'" >>$(@D)/uconfig.sh - echo "archname='$(GNU_TARGET_NAME)'" >>$(@D)/uconfig.sh - echo "osname='linux'" >>$(@D)/uconfig.sh - echo "cc='$(TARGET_CC)'" >>$(@D)/uconfig.sh - echo "ccflags='$(TARGET_CFLAGS)'" >>$(@D)/uconfig.sh - echo "optimize='$(TARGET_CFLAGS)'" >>$(@D)/uconfig.sh - echo "usecrosscompile='define'" >>$(@D)/uconfig.sh - echo "d_memset='define'" >>$(@D)/uconfig.sh - echo "i_fcntl='define'" >>$(@D)/uconfig.sh - echo "useperlio='define'" >>$(@D)/uconfig.sh - echo "u32type='unsigned int'" >>$(@D)/uconfig.sh - echo "need_va_copy='define'" >>$(@D)/uconfig.sh - echo "d_poll='define'" >>$(@D)/uconfig.sh - echo "i_poll='define'" >>$(@D)/uconfig.sh - $(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h - $(SED) 's/local\///' $(@D)/uconfig.sh + -e '/^osname=/d' -e '/^d_archlib=/d' -e '/^i_fcntl=/d' \ + -e '/^useperlio=/d' $(MICROPERL_UCONFIG_SH) + $(SED) 's/5\.$(MICROPERL_VERSION_MAJOR)/$(MICROPERL_VERSION)/' $(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 "archname='$(GNU_TARGET_NAME)'" >>$(MICROPERL_UCONFIG_SH) + echo "osname='linux'" >>$(MICROPERL_UCONFIG_SH) + echo "cc='$(TARGET_CC)'" >>$(MICROPERL_UCONFIG_SH) + echo "ccflags='$(TARGET_CFLAGS)'" >>$(MICROPERL_UCONFIG_SH) + echo "optimize='$(TARGET_CFLAGS)'" >>$(MICROPERL_UCONFIG_SH) + echo "usecrosscompile='define'" >>$(MICROPERL_UCONFIG_SH) + echo "i_fcntl='define'" >>$(MICROPERL_UCONFIG_SH) + echo "useperlio='define'" >>$(MICROPERL_UCONFIG_SH) + echo "d_poll='define'" >>$(MICROPERL_UCONFIG_SH) + echo "i_poll='define'" >>$(MICROPERL_UCONFIG_SH) $(MICROPERL_BIGENDIAN) $(MICROPERL_LARGEFILE) $(MICROPERL_WCHAR) - $(MAKE) -C $(@D) -f Makefile.micro regen_uconfig + $(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 - cp -f $(@D)/uconfig.sh $(@D)/config.sh + cp -f $(MICROPERL_UCONFIG_SH) $(@D)/config.sh echo "ccname='$(TARGET_CC)'" >>$(@D)/config.sh echo "PERL_CONFIG_SH=true" >>$(@D)/config.sh touch $(@D)/config.h # avoid warning : out of date