From patchwork Sun Dec 7 14:57:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Walle X-Patchwork-Id: 418469 X-Patchwork-Delegate: bryanhundven@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6C17B1400E7 for ; Mon, 8 Dec 2014 01:57:34 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=IQyHmXfpu7cSR0FrsdhzLs/HkVCRzuL ZYONOErZLsuWERB/j4xRhjz+UaD7YGtgHp+LolUC+SV+V76mLXNzI6tyd4ImLa54 VjOFPCxH8Ua8VXLWttfMkyc2IAecwDP7el4iTe2OrcgSxLsBJsk11VBcTxiCNV0b kb2GBWK8Wlh8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=BChGWvFguOe25kwxCE4hO2C1tK0=; b=VRdMv N3TkjJNAoyftlxoKz2lvWRPcxph5c/PE9BVtjpx8Tg0KG2m3eyIwtKqY0cYWNZks PqMKQUK4XsND6/i24FJ3aPsWanvGoXoChdnV35ylEDwfvgLEXmjK6j0y2UJ2vXZg PPryLdoh9b+OGJJEL+8UM/zaJf06AxymdvZQbk= Received: (qmail 14147 invoked by alias); 7 Dec 2014 14:57:26 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org Received: (qmail 14135 invoked by uid 89); 7 Dec 2014 14:57:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: smtprelay01.ispgateway.de Received: from smtprelay01.ispgateway.de (HELO smtprelay01.ispgateway.de) (80.67.31.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sun, 07 Dec 2014 14:57:23 +0000 Received: from [93.215.202.204] (helo=localhost) by smtprelay01.ispgateway.de with esmtpsa (TLSv1.2:AES128-GCM-SHA256:128) (Exim 4.84) (envelope-from ) id 1XxdGx-00079b-9Y; Sun, 07 Dec 2014 15:57:19 +0100 From: Bernhard Walle To: crossgcc@sourceware.org Cc: bryanhundven@gmail.com, Bernhard Walle Subject: [PATCH] comptools/make: Install 'gmake' symlink Date: Sun, 7 Dec 2014 15:57:11 +0100 Message-Id: <1417964231-20347-1-git-send-email-bernhard@bwalle.de> In-Reply-To: References: X-Df-Sender: YmVybmhhcmRAYndhbGxlLmRl X-IsSubscribed: yes We had following problem: We're building a toolchain with an old glibc version for compatibility with old Linux distributions (glibc 2.9). This version requires make < 4 to build. However, the configure script of glibc looks for make in the order "gnumake", "gmake" and "make". So when "gmake" is available in the system (which is the case on Gentoo Linux per default, unfortunately), then configure finds the system gmake 4.1 instead of the ct-ng make 3.82. This patch adds an option to install a symlink so that 'gmake' is also available in the old version when building toolchains. Signed-off-by: Bernhard Walle --- v2: Add an option instead of always installing the symlink config/companion_tools.in | 5 +++++ scripts/build/companion_tools/050-make.sh | 3 +++ 2 files changed, 8 insertions(+) diff --git a/config/companion_tools.in b/config/companion_tools.in index 18811e6..f922388 100644 --- a/config/companion_tools.in +++ b/config/companion_tools.in @@ -35,6 +35,11 @@ config COMP_TOOLS_make bool prompt "make" +config COMP_TOOLS_make_gmake + bool + prompt "Add gmake symlink to companion gnu/make" + depends on COMP_TOOLS_make + config COMP_TOOLS_m4 bool prompt "m4" diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh index 6524e35..7c67757 100644 --- a/scripts/build/companion_tools/050-make.sh +++ b/scripts/build/companion_tools/050-make.sh @@ -22,6 +22,9 @@ do_companion_tools_make_build() { --prefix="${CT_BUILDTOOLS_PREFIX_DIR}" CT_DoExecLog ALL make CT_DoExecLog ALL make install + if [ "${CT_COMP_TOOLS_make_gmake}" = "y" ]; then + CT_DoExecLog ALL ln -sv make "${CT_BUILDTOOLS_PREFIX_DIR}/bin/gmake" + fi CT_Popd CT_EndStep }