From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f199.google.com (mail-dy1-f199.google.com [74.125.82.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 69D6E43CE51 for ; Thu, 1 Oct 2026 05:41:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790833295; cv=none; b=RlsOqBzjGE8Yxbge/5D3cSymjfn4RAox4Z0MhkU956UK5+XI8RYAXbNaqrADfe1pqGCgHqIaIJGiddzs+QQnjl419hLQDq5BRN3zdG0QBPKSxxk8dew8A8qGd4xzcda6E5QThGR977Ij0HNIaD2fBp+AF8/4obEkWLDheH9Vypg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790833295; c=relaxed/simple; bh=O5ODVShe1B0LC+rEY7qNyzL+7S9xq/jUBnul6lx10x4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DnU2iX6TkcCtpQXtsknTEQ19yITGKVijv1eCJ+/cB8bzr4sXeBHg+67fv4ljbASydR12fScDL8HtlAuNy5nWGemTXlmGH2zMIy8FmP3zhoNTxoLSD0EzPMUxRLBESS9VaYsdoL8N6F5cDjQwHgPIr/c1vHogVJBq75p7vlxbFqc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=oAuTFfUU; arc=none smtp.client-ip=74.125.82.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="oAuTFfUU" Received: by mail-dy1-f199.google.com with SMTP id 5a478bee46e88-33713e5e6daso8883222eec.0 for ; Wed, 30 Sep 2026 22:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790833292; x=1791438092; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=x310nNqKeL5QTlQDhNqpbdK2+BHdclA/oEK1ZuBObLY=; b=oAuTFfUUatrQrh0SmJHyc/2QeM5DUhW8hiZHopAMPN2RtGONuqOLU/+G5XIakTI+QY 8//NkPLht0eopCGrcWjGCQksXxQRWycDqp9UJGZqSbrWeXXm3Hzx8ZWL2pc3nDvGhmks pJzCaQD/dsl2Il8+Zcab1jsDk1TPkqs75v15jJohf1QivO1oqAA9n49ebr2fZDP47Sqv acZ67NDN121cdS4ac4wbCZkJwloMgbwDJjwlmbH5JwdWhDZTymJ7diJSop//mY+nNhwG M/yx1aJBxNYzj2680dULPpec2rHN6d81TdHNvvDoML9403YHt5iSuWoeuU5StD5Lw1XX dlxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790833292; x=1791438092; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=x310nNqKeL5QTlQDhNqpbdK2+BHdclA/oEK1ZuBObLY=; b=e0RWU48TzoCaF1+ictCYrlmRM7IhgcdsP3yiVCipBNPxEDg/4mkA9IIOgkGgXHMDJc 4VPWlaH5oQXe6kSo/L+IlhjDHpZoWqMxGvq+UblplJz+EY7FCruHvED0zs0aOyTxVgYM m+p1PB3Lm3iN5RhNnHRAD0yUdifqkkW4gicJNe3m4ok0WWrjdIevYYIpSij7pxLNqqV+ ugOuXIXI7HzksIzDvSimx+Y7fBsQQ8kIsSIS/FDKYCFnQ2tzDkiNipr8THL/uGOAHwgo inbpAxPQ07IOaTZ1d/S/tv1pqR3Je31+NcHWQRdtqaTJSpl8mUnlBYU5cHmxr4pC7g7d LUzg== X-Forwarded-Encrypted: i=1; AKwUvBxxvCKjkiD+xVQBuc1Dj/R9UMnkLd30BRyvDQlG6ohtn3xlNPvrw9dY1aBxtI8Pq0DvsXOi5Ifbs8g9VRE=@vger.kernel.org X-Gm-Message-State: AFuF++nDJDI9TTe67nkeZ8ZMzFsplI67AiRn5MdieqvcCbgSGQ9x9LU/ DrdRFptpUO7IFIi+cKhW3B02VPb5Cb3SPkt8Rp/SzdqGlTfNOiwNe4oM/tD7Sxgkkm+1MxAFI46 NrvwbUNBjVw== X-Received: from dlbej9.prod.google.com ([2002:a05:7022:c49:b0:14d:d7f0:5394]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:290a:b0:14d:3c0c:79e8 with SMTP id a92af1059eb24-14d3c0c7f31mr3337305c88.10.1790833291748; Wed, 30 Sep 2026 22:41:31 -0700 (PDT) Date: Wed, 30 Sep 2026 22:41:19 -0700 In-Reply-To: <20261001054120.1570943-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20261001023423.1225713-1-irogers@google.com> <20261001054120.1570943-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.rc1.315.gc6ed9934b7-goog Message-ID: <20261001054120.1570943-4-irogers@google.com> Subject: [PATCH v2 3/4] perf build: Clear GTK4 instead of setting unused NO_GTK4 when gtk4 is missing From: Ian Rogers To: irogers@google.com, acme@kernel.org, leo.yan@arm.com, namhyung@kernel.org Cc: adrian.hunter@intel.com, james.clark@linaro.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org Content-Type: text/plain; charset="UTF-8" Commit 4751bddd3f98 ("perf tools: Make GTK2 support opt-in") switched Makefile.config and Makefile.perf from checking 'ifndef NO_GTK2' to 'ifdef GTK2' (now 'ifdef GTK4'), leaving 'NO_GTK4 := 1' in Makefile.config unused. As a result, when building with GTK4=1 on a system without gtk4 development headers, Makefile.perf still attempted to build and install libperf-gtk.so under 'ifdef GTK4'. Replace 'NO_GTK4 := 1' with 'override GTK4 :=' so that 'ifdef GTK4' in Makefile.perf evaluates to false when the gtk4 feature check fails. Fixes: 4751bddd3f98 ("perf tools: Make GTK2 support opt-in") Assisted-by: Antigravity:gemini-3.1-pro Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 8f46885d6df5..cafc7be79643 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -786,7 +786,7 @@ ifdef GTK4 $(call feature_check,gtk4) ifneq ($(feature-gtk4), 1) $(warning GTK4 not found, disables GTK4 support. Please install gtk4-devel or libgtk-4-dev) - NO_GTK4 := 1 + override GTK4 := else CFLAGS += -DHAVE_GTK4_SUPPORT GTK_CFLAGS += $(shell $(PKG_CONFIG) --cflags gtk4 2>/dev/null) -- 2.56.0.rc1.315.gc6ed9934b7-goog