From patchwork Mon Dec 9 14:02:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 181026 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4384519ile; Mon, 9 Dec 2019 06:02:11 -0800 (PST) X-Google-Smtp-Source: APXvYqwjYXaLqAspvWzu599BK343WJ5VsSgkMc4ivvw0/tZ9CXQgNpk9QZGqqcke95raTcvGcLnn X-Received: by 2002:ac2:44d9:: with SMTP id d25mr9061159lfm.15.1575900130885; Mon, 09 Dec 2019 06:02:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575900130; cv=none; d=google.com; s=arc-20160816; b=vN78tZn9yfS0COxQNXp9t+LLR7YKTMVNXXCsuDfDl2hC4pTHVnvhWh9zCnHa10fDbB d1lwtO0L6QH9rcka930M8AMxgIG7Jdb/fLjPpqD3D109eKFdOymSMHb8FMn8xr+qOcCG vOVI+8AXOVjuaIWFS4PYte8CXNtXU1xG1ocVRBweSObNm3VjfVBNv66UefKdsw9KpHVG JwL4RTTkIg7vnQT3Rb26LTt6dRy8U6cDs+/flP8jDgwQ4cIkduEUi1ieWu5r/ZHvXJnA amG2wzjBoQjBGAGdtKPBDFkg1Hp1/kzS+pEEkDV/CluB8J4gjdDp27Yxc3n4UZq0CqBu BGtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:errors-to:sender:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:message-id:date:to:from:delivered-to:dkim-signature; bh=oy8/2pZBWARCdJWxuz7+67zlDjUViaLZXPyBZhHDxL4=; b=WxbIVNQQx4pvLtiu+CdlaSjpewazbiLk5/P1BkJpLz/p5xTpQRa2+YM/pb78NIk6Da lTBvbEsfMGC8+OQAeeURfoCnjdfXFaFTA6f1OlERKLwOb2Pk9yKePJ/zjS5ukPzb2iXw Tt+oReuROnX/63DdAnpBcVKK4xKW6MxPJWtsrhjlXnw5Xo3ag9x58yYDo1bdy6ZOnfDk SnwRiFH6jJ9NIQCWyZChmvRAqEJYVdn/ID5PACtjswd2FiQWjOLMtda12UqNsIKBzhh7 rh1NVC6+zQowJKa6wkKOex/XbiXRD8Q0DqBY4vm3/y3/bjIaAqCXkVDfqUGGhhGAjEyo CtQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PVEiRJvw; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com. [207.211.31.81]) by mx.google.com with ESMTPS id op26si15337478ejb.337.2019.12.09.06.02.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Dec 2019 06:02:10 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PVEiRJvw; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575900129; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=oy8/2pZBWARCdJWxuz7+67zlDjUViaLZXPyBZhHDxL4=; b=PVEiRJvwVvuFzgQiiHOLdXRUt3s+sMOO6i+2WuYNO7F1DSmcCbeke+lIpwhjajBvjypTpS 6UR5F1YG/8iD8cF/DN5Z+PDkUwF/23T0JTgTO/Xc2jcsNTlXmjCkI1Y5f2AlAsYxcPg96g SEMec6xynmShZQY8GWkv6ZPdYSYIkbA= 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-87-xVZ3HVc-NhWK8wCtb5uBZg-1; Mon, 09 Dec 2019 09:02:04 -0500 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 932EC189DF6D; Mon, 9 Dec 2019 14:01:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFE731001B09; Mon, 9 Dec 2019 14:01:56 +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 25F0083552; Mon, 9 Dec 2019 14:01:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB9E1pSp028710 for ; Mon, 9 Dec 2019 09:01:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id D0B665D6D0; Mon, 9 Dec 2019 14:01:51 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-120-98.rdu2.redhat.com [10.10.120.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F7955D6C5; Mon, 9 Dec 2019 14:01:48 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 9 Dec 2019 09:02:56 -0500 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Cole Robinson Subject: [libvirt] [PATCH] Fix src/ pkg-config API XML paths 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-MC-Unique: xVZ3HVc-NhWK8wCtb5uBZg-1 X-Mimecast-Spam-Score: 0 The .pc files in src/ are intended for use with the ./run script, to ease building bindings against an uninstalled libvirt build. The pointer to the API XML files is incorrect though, it needs to point into the build tree. This fixes use of the run script for building libvirt-python, ex: /path/to/libvirt.git/run ./setup.py build Signed-off-by: Cole Robinson --- src/libvirt-lxc.pc.in | 2 +- src/libvirt-qemu.pc.in | 2 +- src/libvirt.pc.in | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Daniel P. Berrangé diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in index 27e3de4244..9243bcf903 100644 --- a/src/libvirt-lxc.pc.in +++ b/src/libvirt-lxc.pc.in @@ -9,7 +9,7 @@ includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ -libvirt_lxc_api=@datadir@/docs/libvirt-lxc-api.xml +libvirt_lxc_api=@abs_top_builddir@/docs/libvirt-lxc-api.xml Name: libvirt Version: @VERSION@ diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in index 3eb9ad4bc1..a4f9e65c03 100644 --- a/src/libvirt-qemu.pc.in +++ b/src/libvirt-qemu.pc.in @@ -9,7 +9,7 @@ includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ -libvirt_qemu_api=@datadir@/docs/libvirt-qemu-api.xml +libvirt_qemu_api=@abs_top_builddir@/docs/libvirt-qemu-api.xml Name: libvirt Version: @VERSION@ diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in index 6ff1ce6272..a16e455210 100644 --- a/src/libvirt.pc.in +++ b/src/libvirt.pc.in @@ -9,12 +9,12 @@ includedir=@abs_top_builddir@/include source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_builddir@ -libvirt_api=@datadir@/docs/libvirt-api.xml +libvirt_api=@abs_top_builddir@/docs/libvirt-api.xml # For compat with older versions - also present # in libvirt-qemu.pc / libvirt-lxc.pc -libvirt_qemu_api=@datadir@/docs/libvirt-qemu-api.xml -libvirt_lxc_api=@datadir@/docs/libvirt-lxc-api.xml +libvirt_qemu_api=@abs_top_builddir@/docs/libvirt-qemu-api.xml +libvirt_lxc_api=@abs_top_builddir@/docs/libvirt-lxc-api.xml Name: libvirt Version: @VERSION@