From nobody Mon Feb 9 22:04:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626108968047384.34770071166736; Mon, 12 Jul 2021 09:56:08 -0700 (PDT) Received: from localhost ([::1]:36608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2zDz-0001fT-2p for importer@patchew.org; Mon, 12 Jul 2021 12:56:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2z9t-0003UI-4b for qemu-devel@nongnu.org; Mon, 12 Jul 2021 12:51:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36264) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2z9r-0003N4-EW for qemu-devel@nongnu.org; Mon, 12 Jul 2021 12:51:52 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-239-c5ulItoWOS-_WY14fKm0Lw-1; Mon, 12 Jul 2021 12:51:49 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D76910BB647; Mon, 12 Jul 2021 16:51:25 +0000 (UTC) Received: from localhost (ovpn-112-230.ams2.redhat.com [10.36.112.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 808B8784C9; Mon, 12 Jul 2021 16:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626108710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hB5P6/oAnK+q53q4/eCPG38OXfvr8W/dpT8E0EIyxnU=; b=ERSVCCzS48gz7w/k95HTnouxFglcnauIljWb0imeZob1HQSZ7RA9vmYgvN8g5z7kj5UzQh j1okdPy+ulSdpTJNQDxm+nDN8WMXw+/wHAAg+m7Qt7iDWdui03ZtichbHlBqxMku5OxqtH vB/LVOXuJzhvrHFBIablTk2N+cjNyMA= X-MC-Unique: c5ulItoWOS-_WY14fKm0Lw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL 6/6] trace, lttng: require .pc files Date: Mon, 12 Jul 2021 17:50:01 +0100 Message-Id: <20210712165001.429113-7-stefanha@redhat.com> In-Reply-To: <20210712165001.429113-1-stefanha@redhat.com> References: <20210712165001.429113-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , qemu-block@nongnu.org, "Dr. David Alan Gilbert" , Markus Armbruster , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1626108969420100001 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini The next version of lttng-libs will not require liburcu at run time anymore. Therefore, it is expected that distros will not include the urcubp libraries anymore when installing lttng-ust-devel. To avoid future problems, just require pkg-config to detect lttng-ust. The .pc files for lttng-ust correctly include liburcubp.a for static builds, and have always done since pkg-config files were added in 2011. Signed-off-by: Paolo Bonzini Message-id: 20210712155710.520889-1-pbonzini@redhat.com Signed-off-by: Stefan Hajnoczi --- configure | 18 ++---------------- meson.build | 4 ---- trace/meson.build | 2 +- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 85db248ac1..4d0a2bfdd8 100755 --- a/configure +++ b/configure @@ -3606,21 +3606,8 @@ fi ########################################## # For 'ust' backend, test if ust headers are present if have_backend "ust"; then - cat > $TMPC << EOF -#include -int main(void) { return 0; } -EOF - if compile_prog "" "-Wl,--no-as-needed -ldl" ; then - if $pkg_config lttng-ust --exists; then - lttng_ust_libs=3D$($pkg_config --libs lttng-ust) - else - lttng_ust_libs=3D"-llttng-ust -ldl" - fi - if $pkg_config liburcu-bp --exists; then - urcu_bp_libs=3D$($pkg_config --libs liburcu-bp) - else - urcu_bp_libs=3D"-lurcu-bp" - fi + if $pkg_config lttng-ust --exists; then + lttng_ust_libs=3D$($pkg_config --libs lttng-ust) else error_exit "Trace backend 'ust' missing lttng-ust header files" fi @@ -4773,7 +4760,6 @@ fi if have_backend "ust"; then echo "CONFIG_TRACE_UST=3Dy" >> $config_host_mak echo "LTTNG_UST_LIBS=3D$lttng_ust_libs" >> $config_host_mak - echo "URCU_BP_LIBS=3D$urcu_bp_libs" >> $config_host_mak fi if have_backend "dtrace"; then echo "CONFIG_TRACE_DTRACE=3Dy" >> $config_host_mak diff --git a/meson.build b/meson.build index dd7f9ed6a8..4dea2d9dd3 100644 --- a/meson.build +++ b/meson.build @@ -319,10 +319,6 @@ lttng =3D not_found if 'CONFIG_TRACE_UST' in config_host lttng =3D declare_dependency(link_args: config_host['LTTNG_UST_LIBS'].sp= lit()) endif -urcubp =3D not_found -if 'CONFIG_TRACE_UST' in config_host - urcubp =3D declare_dependency(link_args: config_host['URCU_BP_LIBS'].spl= it()) -endif pixman =3D not_found if have_system or have_tools pixman =3D dependency('pixman-1', required: have_system, version:'>=3D0.= 21.8', diff --git a/trace/meson.build b/trace/meson.build index 08f83a15c3..ef18f11d64 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -26,7 +26,7 @@ foreach dir : [ '.' ] + trace_events_subdirs input: trace_events_file, command: [ tracetool, group, '--format=3Du= st-events-h', '@INPUT@', '@OUTPUT@' ], depend_files: tracetool_depends) - trace_ss.add(trace_ust_h, lttng, urcubp) + trace_ss.add(trace_ust_h, lttng) genh +=3D trace_ust_h endif trace_ss.add(trace_h, trace_c) --=20 2.31.1