From nobody Sun Apr 28 05:22:51 2024 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=1594803724; cv=none; d=zohomail.com; s=zohoarc; b=WPJPQRhWWSKAM/gcPDPofhLgkNtawrHXn6eNGugNedsnyg7FEtVF5ymdWm4WmQvtSnnDXTLm5QXo44GW6VTB5J/72uALS/mS0AvPJFC5VK47gbX8L1j9eW6KZN9P+vPjt3wq/o6mkqny1KEaccvSrcqJ2RPIVRK9i9p5EpKiaaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594803724; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=1KlsIp+wBQdPO+wEqlIi8/xZ3V/fkYd2JxWJR4DrRiI=; b=i2G0Mox8u7yQEnT43nFUWuOLLZu+Xpin/0AG4MNlqlGv38M9H4GkA/rI0Myg0L2cBPMrZK9XfhaaV4U88rfPxl4QmpsrDNVxh3E3tL0iABeDhVZp7tW4Cd5Gst4q8TIgJzz0R3f6Xcjtd5BFt05fPR6SaqYfQ395zIOh3wzWBzE= 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 1594803724496345.6866241235937; Wed, 15 Jul 2020 02:02: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 1jvdIN-0008Di-F4; Wed, 15 Jul 2020 09:01:43 +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 1jvdIM-0008Dd-T7 for xen-devel@lists.xenproject.org; Wed, 15 Jul 2020 09:01:42 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id cccba14e-c679-11ea-93a3-12813bfff9fa; Wed, 15 Jul 2020 09:01:42 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 7F3B0AF59; Wed, 15 Jul 2020 09:01:44 +0000 (UTC) X-Inumbo-ID: cccba14e-c679-11ea-93a3-12813bfff9fa X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Subject: [PATCH] qemu-trad: remove Xen path dependencies Date: Wed, 15 Jul 2020 11:01:40 +0200 Message-Id: <20200715090140.7590-1-jgross@suse.com> X-Mailer: git-send-email 2.26.2 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: , Cc: Juergen Gross , ian.jackson@eu.citrix.com Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" xen-hhoks.mak contains hard wired paths for the used libraries of qemu-trad. Replace those by the make variables from Xen's Rules.mk, which is already included. This in turn removes the need to add the runtime link paths of the libraries the directly used libraries depend on. Signed-off-by: Juergen Gross --- xen-hooks.mak | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/xen-hooks.mak b/xen-hooks.mak index a68eba3c..2689db0f 100644 --- a/xen-hooks.mak +++ b/xen-hooks.mak @@ -1,10 +1,8 @@ -CPPFLAGS+=3D -I$(XEN_ROOT)/tools/libs/toollog/include -CPPFLAGS+=3D -I$(XEN_ROOT)/tools/libs/evtchn/include -CPPFLAGS+=3D -I$(XEN_ROOT)/tools/libs/gnttab/include +XEN_LIBS =3D evtchn gnttab ctrl guest store + CPPFLAGS+=3D -DXC_WANT_COMPAT_MAP_FOREIGN_API CPPFLAGS+=3D -DXC_WANT_COMPAT_DEVICEMODEL_API -CPPFLAGS+=3D -I$(XEN_ROOT)/tools/libxc/include -CPPFLAGS+=3D -I$(XEN_ROOT)/tools/xenstore/include +CPPFLAGS +=3D $(foreach lib,$(XEN_LIBS),$(CFLAGS_libxen$(lib))) CPPFLAGS+=3D -I$(XEN_ROOT)/tools/include =20 SSE2 :=3D $(call cc-option,-msse2,) @@ -22,15 +20,7 @@ endif =20 CFLAGS +=3D $(CMDLINE_CFLAGS) =20 -LIBS +=3D -L$(XEN_ROOT)/tools/libs/evtchn -lxenevtchn -LIBS +=3D -L$(XEN_ROOT)/tools/libs/gnttab -lxengnttab -LIBS +=3D -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest -LIBS +=3D -L$(XEN_ROOT)/tools/xenstore -lxenstore -LIBS +=3D -Wl,-rpath-link=3D$(XEN_ROOT)/tools/libs/toollog -LIBS +=3D -Wl,-rpath-link=3D$(XEN_ROOT)/tools/libs/toolcore -LIBS +=3D -Wl,-rpath-link=3D$(XEN_ROOT)/tools/libs/call -LIBS +=3D -Wl,-rpath-link=3D$(XEN_ROOT)/tools/libs/foreignmemory -LIBS +=3D -Wl,-rpath-link=3D$(XEN_ROOT)/tools/libs/devicemodel +LIBS +=3D $(foreach lib,$(XEN_LIBS),$(LDLIBS_libxen$(lib))) =20 LDFLAGS :=3D $(CFLAGS) $(LDFLAGS) =20 --=20 2.26.2