From nobody Mon Feb 9 00:56:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594894993; cv=none; d=zohomail.com; s=zohoarc; b=IxWefPcdpumUyrYN9hZbx3wxE4AVZ+tkxwUSEEx75NfABrOlDJnXsr8mQR1i/JBGRVOIwZ/SxgEOU5W6X54k6BA/NVxEZD5u0Sczod3JnpWMdHZs2ZSORwUC5ikurQtx2jtOp47m4XP5ll9t7wy9M4qPH9woKWS8CvLmLDlE6yo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894993; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2b/p+3LjohK2o7slEq7rFWfBhGsB2GOt0r/BTzK8lSQ=; b=RSLTbkyWAh8RiuEGjJG3881X5UQSp2U9RUMECk9eq5GwrFGUdulAyIp4iuCvTHRdr+QRMIRaeNq+PKhL44xxQoc2P64Zag5pt/Kd77rljtCAjFESqF2hvPwXnnrOPsbFctOQ5CyQS8oP3zT921FDEBiXL6HU21svpCgGqqaMOiU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894993047474.31116518465603; Thu, 16 Jul 2020 03:23:13 -0700 (PDT) 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-288-UxfsfZqIMO2l5FbY9_9yMw-1; Thu, 16 Jul 2020 06:08:27 -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 6AB07100AA30; Thu, 16 Jul 2020 10:08:20 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 476CE61982; Thu, 16 Jul 2020 10:08:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 135C51803B3E; Thu, 16 Jul 2020 10:08:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA4jIW018039 for ; Thu, 16 Jul 2020 06:04:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 241172B6DB; Thu, 16 Jul 2020 10:04:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92D492DE73 for ; Thu, 16 Jul 2020 10:04:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894991; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=2b/p+3LjohK2o7slEq7rFWfBhGsB2GOt0r/BTzK8lSQ=; b=MKfHQrlRhEh+dCX7hUlrZwMPCHhyjTaX17/2l7UXL9CG7awmp934cw4jOtljE5rifHG2bW Fr2HG9BFroj9Y9MI4Ybe2b+UgeRkfontWvtlT2Py2xaSsZiateEu1IrwxvxXKGVTOHw1tX rfJL3lKP758jrh5Xolt00mxtPjEm/7Q= X-MC-Unique: UxfsfZqIMO2l5FbY9_9yMw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 181/351] meson: src: build sanlock.so shared module Date: Thu, 16 Jul 2020 11:56:57 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/locking/Makefile.inc.am | 15 --------------- src/locking/meson.build | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 5b00f5a0c9e..49cf0252162 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,8 +1,5 @@ # vim: filetype=3Dautomake =20 -LOCK_DRIVER_SANLOCK_SOURCES =3D \ - locking/lock_driver_sanlock.c - LOCK_DRIVER_SANLOCK_HELPER_SOURCES =3D \ locking/sanlock_helper.c =20 @@ -38,8 +35,6 @@ OPENRC_INIT_FILES_IN +=3D \ locking/virtlockd.init.in \ $(NULL) =20 -lockdriver_LTLIBRARIES =3D - if WITH_LIBVIRTD augeas_DATA +=3D locking/libvirt_lockd.aug =20 @@ -89,16 +84,6 @@ virtlockd_CFLAGS +=3D \ endif WITH_SASL =20 if WITH_SANLOCK -lockdriver_LTLIBRARIES +=3D sanlock.la -sanlock_la_SOURCES =3D $(LOCK_DRIVER_SANLOCK_SOURCES) -sanlock_la_CFLAGS =3D -I$(srcdir)/conf $(AM_CFLAGS) -sanlock_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -sanlock_la_LIBADD =3D \ - -lsanlock_client \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) - augeas_DATA +=3D locking/libvirt_sanlock.aug =20 if WITH_QEMU diff --git a/src/locking/meson.build b/src/locking/meson.build index af4245ec37a..4767ee9c869 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -30,6 +30,10 @@ lock_protocol_generated +=3D custom_target( ], ) =20 +sanlock_sources =3D [ + 'lock_driver_sanlock.c', +] + lock_driver_lib =3D static_library( 'virt_lock_driver', [ @@ -79,4 +83,21 @@ if conf.has('WITH_LIBVIRTD') ], 'install_dir': lockdriver_dir, } + + if conf.has('WITH_SANLOCK') + virt_modules +=3D { + 'name': 'sanlock', + 'name_prefix': '', + 'sources': [ + files(sanlock_sources), + ], + 'deps': [ + sanlock_dep, + ], + 'link_args': [ + libvirt_no_undefined, + ], + 'install_dir': lockdriver_dir, + } + endif endif --=20 2.26.2