From patchwork Tue Nov 13 08:10:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 198558 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 39D522C00AE for ; Tue, 13 Nov 2012 19:11:45 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BF68CA01D7; Tue, 13 Nov 2012 08:11:43 +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 lmJlre2x4Msb; Tue, 13 Nov 2012 08:11:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7CFE7A01D9; Tue, 13 Nov 2012 08:11:11 +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 518448F753 for ; Tue, 13 Nov 2012 08:11:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 10F0381490 for ; Tue, 13 Nov 2012 08:10:58 +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 P8nvYa0YRXCd for ; Tue, 13 Nov 2012 08:10:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id 13AB481457 for ; Tue, 13 Nov 2012 08:10:53 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1TYBa5-0006Yf-QL; Tue, 13 Nov 2012 09:10:50 +0100 Received: from arnout by vandecaa-laptop with local (Exim 4.80) (envelope-from ) id 1TYBa5-00044q-3h; Tue, 13 Nov 2012 09:10:49 +0100 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Tue, 13 Nov 2012 09:10:45 +0100 Message-Id: <1352794248-15617-3-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352794248-15617-1-git-send-email-arnout@mind.be> References: <1352794248-15617-1-git-send-email-arnout@mind.be> Subject: [Buildroot] [PATCH v2 3/6] perl: remove the double configure hack 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 From: "Arnout Vandecappelle (Essensium/Mind)" configure had to be called twice because with --mode=cross the miniperl-step failed. However, just leaving out the --mode parameter is sufficient to make it work. Since GNU_TARGET_NAME is always different from the host's tuple (it has -buildroot- in it), we can safely assume that the configure script will automatically enter cross mode. Also fix a type in perladmin definition. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/perl/perl.mk | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/package/perl/perl.mk b/package/perl/perl.mk index b84917b..0893eb5 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -47,19 +47,10 @@ ifeq ($(BR2_PACKAGE_GDBM),y) PERL_DEPENDENCIES += gdbm endif -# Normally, --mode=cross should automatically do the two steps -# below, but it doesn't work for some reason. -PERL_HOST_CONF_OPT = \ - --mode=buildmini \ - --target=$(GNU_TARGET_NAME) \ - --target-arch=$(GNU_TARGET_NAME) \ - --set-target-name=$(GNU_TARGET_NAME) - # We have to override LD, because an external multilib toolchain ld is not # wrapped to provide the required sysroot options. We also can't use ccache # because the configure script doesn't support it. PERL_CONF_OPT = \ - --mode=target \ --target=$(GNU_TARGET_NAME) \ --target-tools-prefix=$(TARGET_CROSS) \ --prefix=/usr \ @@ -71,7 +62,7 @@ PERL_CONF_OPT = \ -A myuname="Buildroot $(BR2_VERSION_FULL)" \ -A osname=linux \ -A osvers=$(LINUX_VERSION) \ - -A perlamdin=root + -A perladmin=root ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1) PERL_CONF_OPT += -Dusedevel @@ -87,8 +78,7 @@ PERL_CONF_OPT += --only-mod=$(subst $(space),$(comma),$(PERL_MODULES)) endif define PERL_CONFIGURE_CMDS - (cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_HOST_CONF_OPT)) - (cd $(@D); ./configure $(PERL_CONF_OPT)) + (cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_CONF_OPT)) $(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h endef