From nobody Mon Feb 9 21:12:12 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; dkim=pass; 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; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1645802064; cv=none; d=zohomail.com; s=zohoarc; b=d+EF3Mc2CDriLfcIyzj7bjl1LlT542z7dKAE1537/lRfdZmkC/UtRkto1lADow32CVpKki+0UjVNHTWjCi1c9YNG2BxXitSBvUbyebtEGvxGHSYLiAgEueyByf7u6STNOIZ8ekmhrIprPWmgb5GAz9yLSKsgR4wDIjSStV8xLmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645802064; h=Content-Type: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=YGmyNcpr9+VaLKkdD/2K1Mad4mm0d5TYDZXyoFe2cWk=; b=ORUtvrkzPzyRHzvfy1EKzjMrh8InPALvE0jXQY+m/W+wkq2WU27fO9/snf2MkVKdgHk3DiQjc014cDT0fRf9SJ5SGkoPzeSek1a13GQEEISqzsQexgBh9VF1j4vKxMvlMloMRIk9mdLc9XWdkdLwcsXQ7ZduBkgKaKymkQ9vzOA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16458020645541007.8267630260306; Fri, 25 Feb 2022 07:14:24 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.279194.476899 (Exim 4.92) (envelope-from ) id 1nNcII-000365-Rx; Fri, 25 Feb 2022 15:14:06 +0000 Received: by outflank-mailman (output) from mailman id 279194.476899; Fri, 25 Feb 2022 15:14:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nNcII-00035Y-FQ; Fri, 25 Feb 2022 15:14:06 +0000 Received: by outflank-mailman (input) for mailman id 279194; Fri, 25 Feb 2022 15:14:05 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nNcIH-0006fy-Ap for xen-devel@lists.xenproject.org; Fri, 25 Feb 2022 15:14:05 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 90b877c9-964d-11ec-8539-5f4723681683; Fri, 25 Feb 2022 16:14:04 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 90b877c9-964d-11ec-8539-5f4723681683 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1645802044; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ECjrP9xItuWCPbZk1vIvsP9mwRYqVRzBpP4c/9vcJbk=; b=AtUAtz/gP8g1le1Y+n21yZF/MJ5bWkIbGsA2cgJ3nsByF9RLqWB+xMIO A0UYQjqKaKWKuHVbvQ8oskmAdLZ0EwBLLLqBRugs6TEKXMS7uTf/7qQ0s XwQK/g4xB6sv9RGtV9EGi5M8p/ADZHwA5zuP/+QM2+wQ04/5XIOIbJVvm 0=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 5.1 X-MesageID: 64433043 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:BEphi65W27NUIGGmTy09ZQxRtD3HchMFZxGqfqrLsTDasY5as4F+v jFLX2qGP6rcN2GjeNojaY7koBwFv8XQy9FhGlRpqHg9Hi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuVGuG96yE6j8lkf5KkYAL+EnkZqTRMFWFw0XqPp8Zj2tQy2YLjXlvX0 T/Pi5a31GGNimYc3l08s8pvmDs31BglkGpF1rCWTakjUG72zxH5PrpGTU2CByKQrr1vNvy7X 47+IISRpQs1yfuP5uSNyd4XemVSKlLb0JPnZnB+A8BOiTAazsA+PzpS2FPxpi67hh3Q9+2dx umhurToSj8wF4vPuNgceEhhTihHYIFX2ZPIdC3XXcy7lyUqclPpyvRqSko3IZcZ6qB8BmQmG f4wcW5XKErZ3qTvnez9GrIEascLdaEHOKsWvG1gyjfIS+4rW5nZT43B5MNC3Sd2jcdLdRrbT 5RFNWE0NEibC/FJEm1PDcMGo+7yvSbcdSVolEnEq4kw8lGGmWSd15CyaYGIK7RmX/59gUKwt m/AuWPjDXkyNtOFziGe2mmxneKJliT+MKoCGbv9+vN0jVm7wm0IFAZQRVa9ueO+iEO1R5RYM UN8x8Y1hfFsrgrxFIC7BkDm5i7f1vIBZzZOO7U50Bik7Kn03weyV1FZRwccRM0HmMBjEFTGy WS1t9/uADVutpicRnSc6qqYoFuOBMQFEYMRTXRaFFVYurEPtKl210uSFYg7TMZZm/WoQWmY/ tyckMQpa1z/Z+Yv3r7zw13IiinESnPhHl9svVW/so5IA2pEiG+Zi26AtQmzARVodt/xory9U J4swZn2AAcmV8zlqcB1aL9RdIxFHt7cWNEmvXZhHoM66xOm8GO5cIZb7VlWfRk1b5lYIGO0O BeL4Wu9AaO/2lPwPMebhKrrVqwXIVXIT4y5Bpg4kPIUCnSOSON31H43PhPBt4wcuEMtjbs+K f+mnTWEVh4n5VBc5GPuHY81iOZzrghnnD+7bc2rnnyPjOvFDFbIGOhtDbd7Rr1ghE9yiF6Oq Ig32grj40g3bdASlQGMqd9DdQ1RdCNjbX00wuQOHtO+zsNdMDlJI5fsLXkJIdcNc3h9/gsQw kyAZw== IronPort-HdrOrdr: A9a23:73PudKs1DQmwVPdIvLu9yGJ/7skDcNV00zEX/kB9WHVpmszxra +TdZMgpHjJYVcqKQgdcL+7WZVoLUmwyXcx2/hyAV7AZniDhILLFuFfBOLZqlWKcREWtNQtsJ uIG5IObuEYZmIVsS+V2mWF+q4bsbq6zJw= X-IronPort-AV: E=Sophos;i="5.90,136,1643691600"; d="scan'208";a="64433043" From: Anthony PERARD To: CC: Anthony PERARD , Juergen Gross , Wei Liu Subject: [XEN PATCH v2 14/29] libs: rename LDUSELIBS to LDLIBS and use it instead of APPEND_LDFLAGS Date: Fri, 25 Feb 2022 15:13:06 +0000 Message-ID: <20220225151321.44126-15-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220225151321.44126-1-anthony.perard@citrix.com> References: <20220225151321.44126-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1645802066116100001 Content-Type: text/plain; charset="utf-8" LDLIBS is more appropriate and intended to be used to add library dependencies. APPEND_LDFLAGS wasn't intended to be changed by the build system. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- Notes: v2: - reviewed tools/libs/guest/Makefile | 2 +- tools/libs/hypfs/Makefile | 2 +- tools/libs/light/Makefile | 18 +++++++++--------- tools/libs/stat/Makefile | 2 +- tools/libs/store/Makefile | 2 +- tools/libs/libs.mk | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index ab580e1b64..2005d8a67d 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -102,7 +102,7 @@ NO_HEADERS_CHK :=3D y =20 include $(XEN_ROOT)/tools/libs/libs.mk =20 -libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS +=3D $(ZLIB_LIBS) -lz +libxenguest.so.$(MAJOR).$(MINOR): LDLIBS +=3D $(ZLIB_LIBS) -lz =20 .PHONY: cleanlocal cleanlocal: diff --git a/tools/libs/hypfs/Makefile b/tools/libs/hypfs/Makefile index 39feca87e8..efa955bd50 100644 --- a/tools/libs/hypfs/Makefile +++ b/tools/libs/hypfs/Makefile @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR =3D 1 MINOR =3D 0 =20 -APPEND_LDFLAGS +=3D -lz +LDLIBS +=3D -lz =20 SRCS-y +=3D core.c =20 diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 453bea0067..7c0a5dca85 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -166,14 +166,14 @@ NO_HEADERS_CHK :=3D y =20 include $(XEN_ROOT)/tools/libs/libs.mk =20 -LDUSELIBS-y +=3D $(PTYFUNCS_LIBS) -LDUSELIBS-$(CONFIG_LIBNL) +=3D $(LIBNL3_LIBS) -LDUSELIBS-$(CONFIG_Linux) +=3D -luuid -LDUSELIBS-$(CONFIG_Linux) +=3D -lrt -LDUSELIBS-$(CONFIG_ARM) +=3D -lfdt -LDUSELIBS-y +=3D $(PTHREAD_LIBS) -LDUSELIBS-y +=3D -lyajl -LDUSELIBS +=3D $(LDUSELIBS-y) +LDLIBS-y +=3D $(PTYFUNCS_LIBS) +LDLIBS-$(CONFIG_LIBNL) +=3D $(LIBNL3_LIBS) +LDLIBS-$(CONFIG_Linux) +=3D -luuid +LDLIBS-$(CONFIG_Linux) +=3D -lrt +LDLIBS-$(CONFIG_ARM) +=3D -lfdt +LDLIBS-y +=3D $(PTHREAD_LIBS) +LDLIBS-y +=3D -lyajl +LDLIBS +=3D $(LDLIBS-y) =20 $(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS): CFLAGS +=3D $(CFLAGS_LIBXL) -i= nclude $(XEN_ROOT)/tools/config.h $(ACPI_OBJS) $(ACPI_PIC_OBJS): CFLAGS +=3D -I. -DLIBACPI_STDUTILS=3D\"$(CU= RDIR)/libxl_x86_acpi.h\" @@ -228,7 +228,7 @@ $(XEN_INCLUDE)/_%.h: _%.h $(call move-if-changed,_$*.h,$(XEN_INCLUDE)/_$*.h) =20 libxenlight_test.so: $(PIC_OBJS) $(LIBXL_TEST_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB= _LDFLAGS) -o $@ $^ $(LDUSELIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB= _LDFLAGS) -o $@ $^ $(LDLIBS) $(APPEND_LDFLAGS) =20 test_%: test_%.o test_common.o libxenlight_test.so $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenli= ght)) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) -lyajl $(APPEND_LDFL= AGS) diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index 5840213376..6cd0af5239 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -26,7 +26,7 @@ SRCS-$(CONFIG_FreeBSD) +=3D xenstat_freebsd.c =20 LDLIBS-y +=3D -lyajl LDLIBS-$(CONFIG_SunOS) +=3D -lkstat -APPEND_LDFLAGS +=3D $(LDLIBS-y) +LDLIBS +=3D $(LDLIBS-y) =20 include $(XEN_ROOT)/tools/libs/libs.mk =20 diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile index 8e33db6a66..18ae1fe94d 100644 --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -5,7 +5,7 @@ MAJOR =3D 4 MINOR =3D 0 =20 ifeq ($(CONFIG_Linux),y) -APPEND_LDFLAGS +=3D -ldl +LDLIBS +=3D -ldl endif =20 SRCS-y +=3D xs_lib.c diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index b3d784c57f..3118cb4194 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -18,7 +18,7 @@ CFLAGS +=3D -Werror -Wmissing-prototypes CFLAGS +=3D $(CFLAGS_xeninclude) CFLAGS +=3D $(foreach lib, $(USELIBS_$(LIBNAME)), $(CFLAGS_libxen$(lib))) =20 -LDUSELIBS =3D $(foreach lib, $(USELIBS_$(LIBNAME)), $(LDLIBS_libxen$(lib))) +LDLIBS +=3D $(foreach lib, $(USELIBS_$(LIBNAME)), $(LDLIBS_libxen$(lib))) =20 LIB_OBJS :=3D $(SRCS-y:.c=3D.o) PIC_OBJS :=3D $(SRCS-y:.c=3D.opic) @@ -88,7 +88,7 @@ lib$(LIB_FILE_NAME).so.$(MAJOR): lib$(LIB_FILE_NAME).so.$= (MAJOR).$(MINOR) $(SYMLINK_SHLIB) $< $@ =20 lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxen$(LIBNAME).map - $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,lib$(LIB_FIL= E_NAME).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDUSELIBS) $(APPEN= D_LDFLAGS) + $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,lib$(LIB_FIL= E_NAME).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS) $(APPEND_L= DFLAGS) =20 # If abi-dumper is available, write out the ABI analysis ifneq ($(ABI_DUMPER),) --=20 Anthony PERARD