From nobody Sun Feb 8 11:16:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1594893649; cv=none; d=zohomail.com; s=zohoarc; b=QSE1bfSZRhfpGULIH9BPZ0JcpeL4h25RNDQMWyN4mJbM+5eKqd9Y4NZi4F6KameoBQFpm5sqpsc0UHEb0ZfDKEpO2ftufjTY88RXtNiv0CqPWa7bMlZ7hn4l6XN8teHoomUbdz20IdeUXH5BI6zymYc/MXOKgTA86wjlH3vJZxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893649; 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=XSIlINS9o8jtBFjnu+oGIRgQdSow8csKdL6UwDW86VU=; b=RfposuS8h648KZxwwNgmGwNtAW+WVVyYoxv3p8vz7ADEKQQUYSpiYP76Mp2kZeOT3MTo9BD3No8DfwluLrPRc41xGNEnNCu51ipEjiLOfup06ZxWnGqjXZSY4Ljgcz5GAeXGxud3kGKP0JkWlXvU4jRER9+xWdBfVY28Tw1eP2Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893649238515.64350432092; Thu, 16 Jul 2020 03:00:49 -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-312-c0iZkT2RNeqeL8rd_IubRg-1; Thu, 16 Jul 2020 06:00:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8880A1090; Thu, 16 Jul 2020 10:00:38 +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 5D73B10098AE; Thu, 16 Jul 2020 10:00:38 +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 265A8180CB39; Thu, 16 Jul 2020 10:00:38 +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 06GA0Yri015321 for ; Thu, 16 Jul 2020 06:00:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 674C62B6E2; Thu, 16 Jul 2020 10:00:34 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D64522B6DC for ; Thu, 16 Jul 2020 10:00:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893647; 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=XSIlINS9o8jtBFjnu+oGIRgQdSow8csKdL6UwDW86VU=; b=WNkJbcw6Jq8OTdf3yCK3tlZtrMhqL/wPyFIyVceJaj/VWIwA739DVNKQIwEOEVcYqYD+gW wIhyQIMlOTdsnp/lr5bvCDUIq/+argV7dP3QZUtyX6PkLKe2f/f5NtUB6Wp9Nnz4acoug5 MpnenpExKRi7GwLY5Wi58ooXpvGjUuo= X-MC-Unique: c0iZkT2RNeqeL8rd_IubRg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 015/351] meson: add packager build options Date: Thu, 16 Jul 2020 11:54:11 +0200 Message-Id: <7a27c05bde3ba0806f3a6af302bd0aa22707a808.1594891445.git.phrdina@redhat.com> 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.84 on 10.5.11.22 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 Reviewed-by: J=C3=A1n Tomko --- configure.ac | 13 ------------- meson.build | 14 ++++++++++++++ meson_options.txt | 2 ++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 445a44f2e79..66fc88bd014 100644 --- a/configure.ac +++ b/configure.ac @@ -40,19 +40,6 @@ m4_ifndef([AM_SILENT_RULES], =20 AC_CANONICAL_HOST =20 -LIBVIRT_ARG_WITH([PACKAGER], [Extra packager name], [no]) -LIBVIRT_ARG_WITH([PACKAGER_VERSION], [Extra packager version], [no]) -if test "x$with_packager" !=3D "xno" -then - AC_DEFINE_UNQUOTED([PACKAGER], ["$with_packager"], - [Extra package name]) -fi -if test "x$with_packager_version" !=3D "xno" -then - AC_DEFINE_UNQUOTED([PACKAGER_VERSION], ["$with_packager_version"], - [Extra package version]) -fi - dnl Where we look for daemons and admin binaries during configure LIBVIRT_SBIN_PATH=3D"$PATH:/sbin:/usr/sbin:/usr/local/sbin" =20 diff --git a/meson.build b/meson.build index 07dacf92009..633db2df51a 100644 --- a/meson.build +++ b/meson.build @@ -110,6 +110,20 @@ configure_file( ) =20 =20 +# packager options + +packager =3D get_option('packager') +packager_version =3D get_option('packager_version') + +if packager !=3D '' + conf.set_quoted('PACKAGER', packager) +endif + +if packager_version !=3D '' + conf.set_quoted('PACKAGER_VERSION', packager_version) +endif + + # figure out libvirt version strings =20 arr_version =3D meson.project_version().split('.') diff --git a/meson_options.txt b/meson_options.txt index 5338ee89b9a..2281faec429 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ option('no-git', type: 'boolean', value: false, description: 'Disable git = submodule update') +option('packager', type: 'string', value: '', description: 'Extra packager= name') +option('packager_version', type: 'string', value: '', description: 'Extra = packager version') option('system', type: 'boolean', value: false, description: 'Set install = paths to system ones') option('runstatedir', type: 'string', value: '', description: 'State direc= tory for temporary sockets, pid files, etc') --=20 2.26.2