From nobody Mon Feb 9 09:33:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1560338400; cv=none; d=zoho.com; s=zohoarc; b=c/hMbl3hypWhHBiEOSyaMT9Btiv6FGADJ2dOrTKp87aQD34qgLqFWw1izcSms3lpS0CqZiVRZbUw+tEtbsqewHVlXKSEbhqKezCSprZ8zseG4PI2l7T0T6+zBiQScwU6IFTE4p2k9tfG2Fnu3EXIcZiaM/z3HgD9DktijJjEXeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560338400; 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:ARC-Authentication-Results; bh=EIp/ITYkToE9S1XNgxCx8pvc+x6VB0xrSuQAoGKRcXs=; b=HY4qaQ9Ful3Z9EwyiYxphhyax7jZqDeTynTyXL68P5reMUN82eXrQPT+hC42flIlNRweE1OWLb7se5/WqtC61GLRdMQHWgjY+gW1vfr79f7/vnvQGNdt30zzAU/oaaRyT/m800v1dR81SI3v1mt/3cuafIt3HeG1GMOz1rZ7zyQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560338400907485.52578809517615; Wed, 12 Jun 2019 04:20:00 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CE58E356F6; Wed, 12 Jun 2019 11:19:46 +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 27FE427BDB; Wed, 12 Jun 2019 11:19:44 +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 DB5DB1806B1A; Wed, 12 Jun 2019 11:19:37 +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 x5CBJYvW025301 for ; Wed, 12 Jun 2019 07:19:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 667C71712D; Wed, 12 Jun 2019 11:19:34 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E4D1A377B for ; Wed, 12 Jun 2019 11:19:33 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 12 Jun 2019 13:19:27 +0200 Message-Id: <20190612111929.28748-2-abologna@redhat.com> In-Reply-To: <20190612111929.28748-1-abologna@redhat.com> References: <20190612111929.28748-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] tests: Tweak cputest_LDADDS 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 12 Jun 2019 11:19:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We want have all test programs using qemu_LDADDS also use LDADDS, and cputest is the only existing exception. We can't just replace GNULIB_LIBS with LDADDS though, even though the latter is a superset of the former, because that would result in a linking error due to including the same object twice: /usr/bin/ld: ../src/libvirt_probes.o:.../src/libvirt_probes.o.dtrace-temp.c:141: multiple definition of `libvirt_object_new_semaphore'; ../src/libvirt_probes.o:.../src/libvirt_probes.o.dtrace-temp.c:141: first defined here To work around this, we include both qemu_LDADDS and LDADDS when QEMU support is enabled, and just LDADDS otherwise. Signed-off-by: Andrea Bolognani --- tests/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 6b17d99501..c34cfba34c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -962,11 +962,13 @@ interfacexml2xmltest_LDADD =3D $(LDADDS) cputest_SOURCES =3D \ cputest.c \ testutils.c testutils.h -cputest_LDADD =3D $(LDADDS) $(LIBXML_LIBS) +cputest_LDADD =3D $(LIBXML_LIBS) if WITH_QEMU cputest_SOURCES +=3D testutilsqemu.c testutilsqemu.h -cputest_LDADD +=3D libqemumonitortestutils.la $(qemu_LDADDS) $(GNULIB_LIBS) -endif WITH_QEMU +cputest_LDADD +=3D libqemumonitortestutils.la $(qemu_LDADDS) $(LDADDS) +else ! WITH_QEMU +cputest_LDADD +=3D $(LDADDS) +endif ! WITH_QEMU =20 metadatatest_SOURCES =3D \ metadatatest.c \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list