From nobody Thu Apr 25 13:16:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1585123120; cv=none; d=zohomail.com; s=zohoarc; b=WOjx/ub+rYjoD02dKfN4eM/nrc+Ud/cqnx3aqORnie25Fo+tjBVjTlZzK23QFqicLWwgC8EANt/8CBqsBwO8WuRA0KZ+B0Ys1EjLxpsIrGO2phUsJn/atxAj/VY7qeeRLa4ts/sSplNR5wIv5Q/mpZR35FUWW0tki8JUvwo9ZYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585123120; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ORmuyL/D4LgIEz6/fHoTav1qvtg1sGcp5yvUPSrdi2c=; b=juef773RuT5Y2i26EY7a3Ta2017DewtGQcKba8gBeHsPVV0fLJIIowruRbHCUS8tPnSOsHSOxeZXGHZniwrb9YoK1n2HisTflkqF7gmzwgPyNvzntIUGb48GrSZdHl6f3V/ORIzA2d/aQkonsKeZmYMqliyMY9sj38uxronL4rA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585123120136807.359609227964; Wed, 25 Mar 2020 00:58:40 -0700 (PDT) Received: from localhost ([::1]:60280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH0vu-0008DW-0E for importer@patchew.org; Wed, 25 Mar 2020 03:58:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41502) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH0vK-0007nS-Lr for qemu-devel@nongnu.org; Wed, 25 Mar 2020 03:58:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH0vJ-0001iO-LL for qemu-devel@nongnu.org; Wed, 25 Mar 2020 03:58:02 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:48317) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH0vJ-0001hW-D9 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 03:58:01 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MZTyo-1imsd63Z02-00WX7J; Wed, 25 Mar 2020 08:57:59 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH] linux-user, configure: fix (again) syscall_nr.h dependencies cleanup Date: Wed, 25 Mar 2020 08:57:57 +0100 Message-Id: <20200325075757.1959961-1-laurent@vivier.eu> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:W7r4l6LmJ0U3Yk5M1D9CPPm10ZVmS2pIXFZdq7IlZ4D+XMziJe+ loM8VlFh5w9QE3r55aDxUMnH9RTx0r6itWrP5Ki9anLTdlz+eTm68AEzXdbj32QYW98GSjF ryXUOg5e2Lx3ZlPUBjRghwqxtc90nSj/Av/Z5TvEfVh0COuVYpOGSxML5K+MCIHTNOR8D2D KY3UjpcOBjVXPGJUGWSmw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Gl2+vzbG23I=:XCg4KQ7Jz/OUsmKM7a9c40 6CF5lqFRzYjYIEgFscSEohEGe9nKx0Qiy09Cf4PHeNmyWii4RoXwLAO2H5lniMQyvx/pHmbUM nWnHJ4GxG/rY2wjjVDUN1uSUsSRxTnaS23jh/5+mG/bt8sGh/Ysf2HNrXWGV/D5PjPq0DHjES VLhIAj+dmx2bkKVqj3Ra7zo4F/A/yqLgwv9SMx5F6O5Q4/ZwCSsu5a1YIxh2/P+eVLbyGr5yL oFZNoZZDOl2Y+plr4ZNiWzL4/rhmn/6CXuPTEqswfqHo/IlE8jPsZEylm/L4skXzJ+X4Fk4y7 v4VdRRDjLPKKYahtWldfd6FB/XiOOk8dob50WK0CDg6GH6Zzev9Z0X8EF8BiC9RO0QMb9EKS6 h/ct3OW8uoSNI9r3+UPUvXP6xGeSwXnbDSp208zl2vGVrmBtL2oy1m5j8BiiDt0ysHifc6wh1 wsSyF2xJ/N8y4N4Npv+mJu5a92ojlGdMBo27aVxepuJg9RF/u9ozwU8wSv3ttzDFBv77jmGhg JDI2oXkHJemLNwALoULH2SahbUzp//5oHLwpdzY6BwFnTXNTHtSW3yEg8GJ83UnL5uucp0Go9 Z/nFM//0GrFwUuusm3wGLC38xb5oFTIA/ATFwTjcUay53AhaSn/b/38diGetK6pmUmi6HI5Eu jxoZ+HbDxx3lfmQIvF1uns1qc37RqYYdYRqDG7g1q5jY3+WG5wNZCKRUSzgiDETBOV7GkoyPP GhnhhCN6hQ9spVggkfmB4Ch311JCbkFtEgx2e7rXhicO8tyoIvkNSNlxayvxeSVuhRluMvPdy Tr4vVjaC+me6ZuibB5ZUQj4r2A2HbqBeCfPD2pj4AEkZn6zjB+QYhEO6R6fFaPeLS0G8SXb X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.131 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch fixes two problems: - it cleanups linux-user variants (for instance ppc64-linux-user and ppc64le-linux-user) - it removes the .o file when it removes the .d file, otherwise the .o file is never updated Fixes: 5f29856b852d ("linux-user, configure: improve syscall_nr.h dependenc= ies checking") Fixes: 4d6a835dea47 ("linux-user: introduce parameters to generate syscall_= nr.h") Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index da09c3589572..89fe881dd46f 100755 --- a/configure +++ b/configure @@ -1910,9 +1910,11 @@ for arch in alpha hppa m68k xtensa sh4 microblaze ar= m ppc s390x sparc sparc64 \ # remove the file if it has been generated in the source directory rm -f "${source_path}/linux-user/${arch}/syscall_nr.h" # remove the dependency files - test -d ${arch}-linux-user && find ${arch}-linux-user -type f -name "*= .d" \ - -exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h" {}= \; \ - -exec rm {} \; + for target in ${arch}*-linux-user ; do + test -d "${target}" && find "${target}" -type f -name "*.d" \ + -exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h= " {} \; \ + -print | while read file ; do rm "${file}" "${file%.d}.o" ; d= one + done done =20 if test -z "$python" --=20 2.25.1