From nobody Sat Apr 27 12:27:41 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519731024196681.4549951956582; Tue, 27 Feb 2018 03:30:24 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B636C7B9AF; Tue, 27 Feb 2018 11:30:22 +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 8E6BC60181; Tue, 27 Feb 2018 11:30:22 +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 41C20180BAE2; Tue, 27 Feb 2018 11:30:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1RBULWn016310 for ; Tue, 27 Feb 2018 06:30:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id 75FBF2024CA6; Tue, 27 Feb 2018 11:30:21 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B094202699A; Tue, 27 Feb 2018 11:30:20 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 27 Feb 2018 11:30:19 +0000 Message-Id: <20180227113019.30696-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] storage: fix sheepdog driver / test linking to avoid duplicating source 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 27 Feb 2018 11:30:23 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The libvirt_storage_backend_sheepdog_priv.la library depends on symbols provided in the libvirt_driver_storage_impl.la library. As such the latter must be listed 2nd when passed to the linker to avoid symbol resolution problems. This mistake is being masked by the sheepdog driver linking in a second copy of the storage driver code. Remove this duplicate linkage of backend source and fix the test link order. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 3 +-- tests/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d3a01dbbe7..8d72f2f1e5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1359,8 +1359,7 @@ libvirt_storage_backend_sheepdog_la_CFLAGS =3D \ $(AM_CFLAGS) =20 libvirt_storage_backend_sheepdog_priv_la_SOURCES =3D \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ - $(STORAGE_DRIVER_BACKEND_SOURCES) + $(STORAGE_DRIVER_SHEEPDOG_SOURCES) libvirt_storage_backend_sheepdog_priv_la_CFLAGS =3D \ -I$(srcdir)/conf \ $(AM_CFLAGS) diff --git a/tests/Makefile.am b/tests/Makefile.am index 09647a959d..d794df3e5c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -842,8 +842,8 @@ storagebackendsheepdogtest_SOURCES =3D \ storagebackendsheepdogtest.c \ testutils.c testutils.h storagebackendsheepdogtest_LDADD =3D \ - ../src/libvirt_driver_storage_impl.la \ ../src/libvirt_storage_backend_sheepdog_priv.la \ + ../src/libvirt_driver_storage_impl.la \ $(LDADDS) else ! WITH_STORAGE_SHEEPDOG EXTRA_DIST +=3D storagebackendsheepdogtest.c --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list