From patchwork Tue Aug 26 23:27:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 383244 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 274E61400A0 for ; Wed, 27 Aug 2014 09:28:34 +1000 (EST) 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=uXJnkRQnatk3yrA1mBozwWBFj7N7dbu O0HGdM69SSVKmcD7a5tmBZzLWEMaC6bxB9EdXus8dzTC2r8oyinZuHLt5WpAEi9D q9l65Pj5mhyt+h2U0KtwqnWCrcuw6kH93DeYsN3EE3JpgdH+NUoIWhIgBKzrygaD peuGwJ9tzjtY= 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=1dReSdv/5NO+A2rKLh9xwvBLVWI=; b=hL7T6 BvFTltQPBy+g1n+N6aBltqNRsnzpXHP4ATOBApoBRD5D3RFpqRUsPscJuhLHSZsl sxxU5+B6jDuPKAGmnu0sulRu9MF3895NxKSyoOsjU9LK3VzSNv67zqLW2qBrO1H5 yEZJW64z9FrIP795G+Fqi5C4QJ+lMRB0GmYi5A= Received: (qmail 471 invoked by alias); 26 Aug 2014 23:28:04 -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 32637 invoked by uid 89); 26 Aug 2014 23:28:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wg0-f49.google.com Received: from mail-wg0-f49.google.com (HELO mail-wg0-f49.google.com) (74.125.82.49) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 26 Aug 2014 23:28:01 +0000 Received: by mail-wg0-f49.google.com with SMTP id k14so15079350wgh.8 for ; Tue, 26 Aug 2014 16:27:58 -0700 (PDT) X-Received: by 10.180.103.234 with SMTP id fz10mr10854153wib.76.1409095678140; Tue, 26 Aug 2014 16:27:58 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id pk9sm12035179wjb.16.2014.08.26.16.27.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Aug 2014 16:27:57 -0700 (PDT) From: "Yann E. MORIN" To: crossgcc@sourceware.org Cc: "Yann E. MORIN" , Fabian Freyer Subject: [PATCH 1/3] scripts/functions: use ${sed} instead of 'sed' Date: Wed, 27 Aug 2014 01:27:53 +0200 Message-Id: In-Reply-To: References: X-IsSubscribed: yes Helps build on BSD-like systems. Reported-by: Fabian Freyer Signed-off-by: "Yann E. MORIN" Cc: Fabian Freyer Signed-off-by: "Fabian Freyer" --- scripts/functions | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/functions b/scripts/functions index eae3b95..cce629c 100644 --- a/scripts/functions +++ b/scripts/functions @@ -317,7 +317,7 @@ CT_SanitiseVarDir() { for var in "$@"; do eval "old_dir=\"\${${var}}\"" new_dir="$( printf "${old_dir}" \ - |sed -r -e 's:/+:/:g;' \ + |${sed} -r -e 's:/+:/:g;' \ )" eval "${var}=\"${new_dir}\"" CT_DoLog DEBUG "Sanitised '${var}': '${old_dir}' -> '${new_dir}'" @@ -381,7 +381,7 @@ CT_Which() { # to the highest entire second # Usage: CT_DoDate CT_DoDate() { - date "$1" |sed -r -e 's/%?N$/000000000/;' + date "$1" |${sed} -r -e 's/%?N$/000000000/;' } CT_STEP_COUNT=1 @@ -403,7 +403,9 @@ CT_DoStep() { # Usage: CT_EndStep CT_EndStep() { local stop=$(CT_DoDate +%s%N) - local duration=$(printf "%032d" $((stop-${CT_STEP_START[${CT_STEP_COUNT}]})) |sed -r -e 's/([[:digit:]]{2})[[:digit:]]{7}$/\.\1/; s/^0+//; s/^\./0\./;') + local duration=$(printf "%032d" $((stop-${CT_STEP_START[${CT_STEP_COUNT}]})) \ + |${sed} -r -e 's/([[:digit:]]{2})[[:digit:]]{7}$/\.\1/; s/^0+//; s/^\./0\./;' + ) local elapsed=$(printf "%02d:%02d" $((SECONDS/60)) $((SECONDS%60))) local level="${CT_STEP_LEVEL[${CT_STEP_COUNT}]}" local message="${CT_STEP_MESSAGE[${CT_STEP_COUNT}]}" @@ -1226,7 +1228,7 @@ CT_DoBuildTargetTuple() { # Sanity checks __sed_alias="" if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then - __sed_alias=$(echo "${CT_TARGET}" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}") + __sed_alias=$(echo "${CT_TARGET}" |${sed} -r -e "${CT_TARGET_ALIAS_SED_EXPR}") fi case ":${CT_TARGET_VENDOR}:${CT_TARGET_ALIAS}:${__sed_alias}:" in :*" "*:*:*:) CT_Abort "Don't use spaces in the vendor string, it breaks things.";; @@ -1279,7 +1281,7 @@ CT_DoTarballIfExists() { CT_DoLog DEBUG " Saving '${dir}'" { tar c -C "${dir}" -v -f - "${extra_tar_opts[@]}" . \ |"${compress[@]}" >"${tarball}.tar${tar_ext}" ; - } 2>&1 |sed -r -e 's/^/ /;' |CT_DoLog STATE + } 2>&1 |${sed} -r -e 's/^/ /;' |CT_DoLog STATE else CT_DoLog STATE " Not saving '${dir}': does not exist" fi @@ -1306,7 +1308,7 @@ CT_DoExtractTarballIfExists() { CT_DoExecLog DEBUG mkdir -p "${dir}" { "${uncompress[@]}" "${tarball}.tar${tar_ext}" \ |tar x -C "${dir}" -v -f - "${extra_tar_opts[@]}" ; - } 2>&1 |sed -r -e 's/^/ /;' |CT_DoLog STATE + } 2>&1 |${sed} -r -e 's/^/ /;' |CT_DoLog STATE else CT_DoLog STATE " Not restoring '${dir}': does not exist" fi @@ -1335,7 +1337,7 @@ CT_DoSaveState() { $0~/^[^ ]+ \(\)/ { _p = 0; } _p == 1 $0 == "}" { _p = 1; } - ' |sed -r -e '/^BASH_(ARGC|ARGV|LINENO|SOURCE|VERSINFO)=/d; + ' |${sed} -r -e '/^BASH_(ARGC|ARGV|LINENO|SOURCE|VERSINFO)=/d; /^(UID|EUID)=/d; /^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh"