From patchwork Wed Jan 18 11:34:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 643685 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp1704095pvb; Wed, 18 Jan 2023 03:35:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXsUhqK3w4HWfuCnOTeoCOLVld1PgoZvt/LUXIBc/Rrv1E5n/CBvxiUBoQPjNA1nD0GtxW7e X-Received: by 2002:a05:6214:1404:b0:531:b490:d387 with SMTP id pr4-20020a056214140400b00531b490d387mr35079123qvb.48.1674041708354; Wed, 18 Jan 2023 03:35:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674041708; cv=none; d=google.com; s=arc-20160816; b=jExcvnSmpBiYNX70BTy04gb+3asw6JJ0cBrMFK7uRR5etnXNi55XnUbxqaVJ5/OCC9 DUwg6nX5OCnj9M3qvtl0Moflee8BoKp9eTRuR/6lY20jJZBZDeFgrkf+CC1lPciUvtxN h60b4zAuGo0kQHmy63TKX8LkV89qk+/ge9M62ugDPx0gRKT8WmQezOex3ez+H0tez6l1 YsnxcA/mkWz9ouFtiqCGp60YwWllpytC+Qou/v1l9QJLMXj9dMQhOP/DrOvsz1b+3rdP gAMhvA+7INb/bdxumH5tVW9K0qrWecMoNuGbUrAGB4IdlZNDsleVN6qYZoY7QuPdqCe4 Gx6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=PBYroXzl8rNtZ74N7ZBiFy7BprfDFqkjIs8yBh/9ijE=; b=uVESqOfxae6yytei21/eSzIjs4zt83y2zgYVIoLYbjUppJvNQdYbY3P5RmQvIkdLmQ H0+E1AsTt4qhx0as/GkBxPtNp+JIGvxlCS+vkoEfxyCAR29vIQK9mRxiT/9ZK4i/2l/p mK3heHVSgthxrP/JB5k37YY5xvySIHQ+5ToY33S4j4LtJWguHKOzI8lXle6SCA1PVFGJ vt0Ld2WLWlpDLJg/JuBl2jPfgLnhxpEDmAse/ZJwp7YAYaVvyRUKjqI1komnxSogC1yT luD9wC0dnFUm7UBqlvYIp+fv6qEbtoY6kexiwCETWfKXeLW5m6liuGs3A39QSeaFUKeZ WdLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZqHIkLRS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r1-20020a056214212100b00534bf70beccsi6923290qvc.36.2023.01.18.03.35.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jan 2023 03:35:08 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZqHIkLRS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pI6i6-0004Nf-RB; Wed, 18 Jan 2023 06:34:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI6i5-0004Kx-8Z for qemu-devel@nongnu.org; Wed, 18 Jan 2023 06:34:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pI6i3-0007Vj-Ju for qemu-devel@nongnu.org; Wed, 18 Jan 2023 06:34:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674041667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PBYroXzl8rNtZ74N7ZBiFy7BprfDFqkjIs8yBh/9ijE=; b=ZqHIkLRSHPQCAtem90CByRAHnau3uZ1814vYZmVFUxKJiepUXvnnEvSG96qj4IHeaQC6rF nBHeEgHUrKgq5wtjog/Q7XlIK6Xq28XFTC6QOwEyYcSCjbKKtubKxEaEhIy3UizZWMrTIg 51ypCgg602hU6daQ8ofilh+8NWZqb4s= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-157-rtMs9j9zNdWmX7dOJGQmoA-1; Wed, 18 Jan 2023 06:34:23 -0500 X-MC-Unique: rtMs9j9zNdWmX7dOJGQmoA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F3AB100F905; Wed, 18 Jan 2023 11:34:23 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CA22492B01; Wed, 18 Jan 2023 11:34:22 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 2/9] Makefile: allow 'make uninstall' Date: Wed, 18 Jan 2023 12:34:11 +0100 Message-Id: <20230118113418.1650416-3-thuth@redhat.com> In-Reply-To: <20230118113418.1650416-1-thuth@redhat.com> References: <20230118113418.1650416-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell Meson supports an "uninstall", so we can easily allow it to work by not suppressing the forwarding of it from Make to meson. We originally suppressed this because Meson's 'uninstall' has a hole in it: it will remove everything that is installed by a mechanism meson knows about, but not things installed by "custom install scripts", and there is no "custom uninstall script" mechanism. For QEMU, though, the only thing that was being installed by a custom install script was the LC_MESSAGES files handled by Meson's i18n module, and that code was fixed in Meson commit 487d45c1e5bfff0fbdb4, which is present in Meson 0.60.0 and later. Since we already require a Meson version newer than that, we're now safe to enable 'uninstall', as it will now correctly uninstall everything that was installed. Signed-off-by: Peter Maydell Resolves: https://gitlab.com/qemu-project/qemu/-/issues/109 Message-Id: <20230110151250.24434-1-peter.maydell@linaro.org> Signed-off-by: Thomas Huth --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a48103cc8a..ce2f83a684 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,7 @@ NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ ninja-cmd-goals = $(or $(MAKECMDGOALS), all) ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g)) -makefile-targets := build.ninja ctags TAGS cscope dist clean uninstall +makefile-targets := build.ninja ctags TAGS cscope dist clean # "ninja -t targets" also lists all prerequisites. If build system # files are marked as PHONY, however, Make will always try to execute # "ninja build.ninja".