From patchwork Mon Sep 8 16:48:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Marie Lemetayer X-Patchwork-Id: 386993 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 B8A34140080 for ; Tue, 9 Sep 2014 02:48:55 +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; q=dns; s= default; b=KrOsjw2NBFEsaV65rUltEHqa57ttsSI1GF/Fm/hXwiMB9apPjhnVd I5+dcS/qxEmiE0qsGYWxkyFS4Ohm9y4UaShluNRowJUnvsjcHMRWxGHroz8qwyzo 09cW/Z0I1IjFuoqqsZLithx1XaO11lbFNj2ExLX1miotRkt2RBaf+w= 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; s=default; bh=OiCtZiICMOs8xb1JvOVvesEWScA=; b=PUvbbzNoWwAy+ghYvKVduH/GDhgt aBzCkfExQ47cPMIAo+Tf9CuCZUy8EAgR7UD8Sw0hrTKtfdq+IjJ4Xu6dFIm4BU4o VLs2C1qguqUec3d/ILKqRehV6+mVkU+V0cBLTqIxo68NhtHhScPAi57FUBysnfk2 VWXRpUx/qg6wVGU= Received: (qmail 22128 invoked by alias); 8 Sep 2014 16:48:47 -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 22107 invoked by uid 89); 8 Sep 2014 16:48:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wg0-f43.google.com Received: from mail-wg0-f43.google.com (HELO mail-wg0-f43.google.com) (74.125.82.43) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 08 Sep 2014 16:48:45 +0000 Received: by mail-wg0-f43.google.com with SMTP id x12so2537586wgg.2 for ; Mon, 08 Sep 2014 09:48:42 -0700 (PDT) X-Received: by 10.194.203.8 with SMTP id km8mr36500167wjc.51.1410194922398; Mon, 08 Sep 2014 09:48:42 -0700 (PDT) Received: from immol0184.aviwest.local (32-200-190-109.dsl.ovh.fr. [109.190.200.32]) by mx.google.com with ESMTPSA id hy9sm11725761wjb.27.2014.09.08.09.48.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Sep 2014 09:48:41 -0700 (PDT) From: Jean-Marie Lemetayer To: crossgcc@sourceware.org Cc: Jean-Marie Lemetayer Subject: [PATCH 1/1] populate: fix empty files.list Date: Mon, 8 Sep 2014 18:48:27 +0200 Message-Id: <1410194907-12823-1-git-send-email-jeanmarie.lemetayer@gmail.com> The output format of the file(1) command have changed since (at least) the version 5.14. We need to to take care of an extra space. Signed-off-by: Jean-Marie Lemetayer --- scripts/populate.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/populate.in b/scripts/populate.in index 28a9740..2fc88f2 100644 --- a/scripts/populate.in +++ b/scripts/populate.in @@ -222,7 +222,7 @@ do_add_lib() { do_resolve_deps() { local file="${1}" local libname - + for libname in $("${CT_READELF}" -d "${file}" \ |"${grep}" -E '\(NEEDED\)[[:space:]]+Shared library:' \ |"${sed}" -r -e 's,.+\[(.+)\] *$,\1,;' \ @@ -280,9 +280,9 @@ CT_TMP_DIR="${TMPDIR:-/tmp}/populate-${rand}-${$}" trap "rm -rf ${CT_TMP_DIR}" EXIT # List all ELF (executables|shared objects)... -find . -type f -exec file {} \; \ -|"${grep}" -E ': ELF [[:digit:]]+-bit (L|M)SB (executable|shared object),' \ -|cut -d ":" -f 1 \ +find . -type f -exec file {} \; \ +|"${grep}" -E ': ELF [[:digit:]]+-bit (L|M)SB +(executable|shared object),' \ +|cut -d ":" -f 1 \ >"${CT_TMP_DIR}/files.list" # ... and use that list to find missing dependencies