From nobody Mon Feb 9 00:19:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1597657804; cv=none; d=zohomail.com; s=zohoarc; b=HbVjLNdi4/bErKiEzdz9oiQ4jEhWCE2djqlb9skltQvIFydOGJ/f9Cuq3vCyMitI44uH9K8pQU7hNClcoLbkVVEXvdmWuRtOjEsvNnhCw2Gj7LTbxoHEqm8oPe4gyRoil/POQfAP7LBYz4kMsSW93MX/pE5U+eXHdbrbhtCMYMQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597657804; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8VNvs6o9amnK4h7rqq6bNVDKDnbd6VUDakJbQvGwoV4=; b=IaZ3SR/xwVbT2i1ncFJUMg8KdVwqCGzyVgm5Ee0T4YBz0Ur766dquK6IWVd2Bd58giGdjmE/wlsgtIgwIrmKHdD3QgDbThKj/1c8q4WCGkZpDWUmnhFQFMoLshhV6UrXjPm3+U/ZJGQV7BNWdtf//TtR5Ocd3xIw5zF9c005hE8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1597657804410505.0059493674172; Mon, 17 Aug 2020 02:50:04 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k7bly-0004Fq-5X; Mon, 17 Aug 2020 09:49:46 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k7blx-00046Z-B1 for xen-devel@lists.xenproject.org; Mon, 17 Aug 2020 09:49:45 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a4a209fa-a2ef-49bd-a9a4-5c0979521f78; Mon, 17 Aug 2020 09:49:27 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 0C72CAEF6; Mon, 17 Aug 2020 09:49:51 +0000 (UTC) X-Inumbo-ID: a4a209fa-a2ef-49bd-a9a4-5c0979521f78 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH II v2 06/17] tools: don't assume libxenguest and libxenctrl to be in same directory Date: Mon, 17 Aug 2020 11:49:11 +0200 Message-Id: <20200817094922.15768-7-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817094922.15768-1-jgross@suse.com> References: <20200817094922.15768-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" There are quite some places in Makefiles assuming libxenguest and libxenctrl being built in the same directory via a single Makefile. Drop this assumption by specifying the dependencies and path variables for both libraries correctly. Signed-off-by: Juergen Gross --- tools/Rules.mk | 7 +++---- tools/libxl/Makefile | 2 +- tools/misc/Makefile | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index b36818bcaa..35d237bba6 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -31,8 +31,7 @@ LIBS_LIBS +=3D hypfs USELIBS_hypfs :=3D toollog toolcore call =20 XEN_libxenctrl =3D $(XEN_ROOT)/tools/libxc -# Currently libxenguest lives in the same directory as libxenctrl -XEN_libxenguest =3D $(XEN_libxenctrl) +XEN_libxenguest =3D $(XEN_ROOT)/tools/libxc XEN_libxenlight =3D $(XEN_ROOT)/tools/libxl # Currently libxlutil lives in the same directory as libxenlight XEN_libxlutil =3D $(XEN_libxenlight) @@ -132,7 +131,7 @@ LDLIBS_libxenguest =3D $(SHDEPS_libxenguest) $(XEN_libx= enguest)/libxenguest$(libex SHLIB_libxenguest =3D $(SHDEPS_libxenguest) -Wl,-rpath-link=3D$(XEN_libxe= nguest) =20 CFLAGS_libxenstore =3D -I$(XEN_libxenstore)/include $(CFLAGS_xeninclude) -SHDEPS_libxenstore =3D $(SHLIB_libxentoolcore) +SHDEPS_libxenstore =3D $(SHLIB_libxentoolcore) $(SHLIB_libxenctrl) LDLIBS_libxenstore =3D $(SHDEPS_libxenstore) $(XEN_libxenstore)/libxenstor= e$(libextension) SHLIB_libxenstore =3D $(SHDEPS_libxenstore) -Wl,-rpath-link=3D$(XEN_libxe= nstore) ifeq ($(CONFIG_Linux),y) @@ -159,7 +158,7 @@ CFLAGS +=3D -O2 -fomit-frame-pointer endif =20 CFLAGS_libxenlight =3D -I$(XEN_libxenlight) $(CFLAGS_libxenctrl) $(CFLAGS_= xeninclude) -SHDEPS_libxenlight =3D $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_li= bxenhypfs) +SHDEPS_libxenlight =3D $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_li= bxenhypfs) $(SHLIB_libxenguest) LDLIBS_libxenlight =3D $(SHDEPS_libxenlight) $(XEN_libxenlight)/libxenligh= t$(libextension) SHLIB_libxenlight =3D $(SHDEPS_libxenlight) -Wl,-rpath-link=3D$(XEN_libxe= nlight) =20 diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 0e8dfc6193..65f3968947 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -188,7 +188,7 @@ libxl_dom.o: CFLAGS +=3D -I$(XEN_ROOT)/tools # include= libacpi/x86.h libxl_x86_acpi.o: CFLAGS +=3D -I$(XEN_ROOT)/tools =20 SAVE_HELPER_OBJS =3D libxl_save_helper.o _libxl_save_msgs_helper.o -$(SAVE_HELPER_OBJS): CFLAGS +=3D $(CFLAGS_libxenctrl) $(CFLAGS_libxenevtch= n) +$(SAVE_HELPER_OBJS): CFLAGS +=3D $(CFLAGS_libxenctrl) $(CFLAGS_libxenevtch= n) $(CFLAGS_libxenguest) =20 PKG_CONFIG =3D xenlight.pc xlutil.pc PKG_CONFIG_VERSION :=3D $(MAJOR).$(MINOR) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 9fdb13597f..e7e74db85f 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -6,6 +6,7 @@ CFLAGS +=3D -Werror CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h CFLAGS +=3D $(CFLAGS_libxenevtchn) CFLAGS +=3D $(CFLAGS_libxenctrl) +CFLAGS +=3D $(CFLAGS_libxenguest) CFLAGS +=3D $(CFLAGS_xeninclude) CFLAGS +=3D $(CFLAGS_libxenstore) =20 --=20 2.26.2