From patchwork Wed Mar 25 07:57:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11457073 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2B0AE1667 for ; Wed, 25 Mar 2020 07:58:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 042EC20409 for ; Wed, 25 Mar 2020 07:58:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 042EC20409 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH0vk-0008DW-RK for patchwork-qemu-devel@patchwork.kernel.org; Wed, 25 Mar 2020 03:58:28 -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 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 dependencies 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 arm 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" ; done + done done if test -z "$python"