From patchwork Wed Aug 15 14:38:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 177689 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 426632C0096 for ; Thu, 16 Aug 2012 00:56:06 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 437D4A05BF; Wed, 15 Aug 2012 14:56:05 +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 1R+gdxyc30iM; Wed, 15 Aug 2012 14:55:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9F35DA05FE; Wed, 15 Aug 2012 14:39:53 +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 34D558F753 for ; Wed, 15 Aug 2012 14:39:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 127CF8A2F8 for ; Wed, 15 Aug 2012 14:39:50 +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 WcdG8PAV2K56 for ; Wed, 15 Aug 2012 14:39:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id 416AB89A61 for ; Wed, 15 Aug 2012 14:39:13 +0000 (UTC) Received: by wgbfm10 with SMTP id fm10so1171101wgb.10 for ; Wed, 15 Aug 2012 07:39:11 -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=VTNfMHdjEwEMTMqkLewdkFNMWq/5/8XKkxIBaF3dJXA=; b=UB68JoYE0WtO57eqGDOvIrk95YpAcWCQuuFIQ8SrPT+03TCTms6u4UtQIBJyuSPvQE aFvXVBMrw4fIgW7j2MF6dpv0lrgsrPPiOoLjMdyfQ7DdldYSYM4Dp7peYZ77nHzSngHZ 2l8YmYL4o9BEif0fSpmbufu2xU0k7RUMMvVgaIJ6wz+Ka8WZ/kKNbgzHT7grEdJqODk9 WuB6G9FzofFuYeL7pDie6BDdsBck5Libka/AJ6gcB5mRQsDEq68oZJr0bX4MAcvXP7aS v9NdaWGZZQRqTl79Uxt7Kk352rXpxHm7OpzTZC/fRxyYwJxgvY18736AOIvOCkINqE7N Ms6w== Received: by 10.216.138.200 with SMTP id a50mr10626108wej.155.1345041551449; Wed, 15 Aug 2012 07:39:11 -0700 (PDT) Received: from xubuntu-12.04 (125.135.193.77.rev.sfr.net. [77.193.135.125]) by mx.google.com with ESMTPS id dc3sm28981440wib.7.2012.08.15.07.39.09 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Aug 2012 07:39:10 -0700 (PDT) From: Francois Perrad To: buildroot@busybox.net Date: Wed, 15 Aug 2012 16:38:29 +0200 Message-Id: <1345041514-31539-7-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345041514-31539-1-git-send-email-francois.perrad@gadz.org> References: <1345041514-31539-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 07/12] 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 8cd1a42..aaa47be 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 @@ -84,60 +96,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