[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] tools/libs: Simplify internal *.pc files


  • To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
  • Date: Wed, 25 Nov 2020 14:49:28 +0000
  • Authentication-results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Ian Jackson <iwj@xxxxxxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Juergen Gross <jgross@xxxxxxxx>
  • Delivery-date: Wed, 25 Nov 2020 14:50:05 +0000
  • Ironport-sdr: EPNlRTuwUZ5o2xYMl0cIlv0NjE+lFPO+mwXCXLZC2PAjzLOGBwezgmRFV/V0H+4ZlSB43jn28R 7w+qS+ObcGYlkTq/pvD19IuLmYenEEmeeCObuTOssWojjvhrGfoFmrQAUFI06oGBbxAipCbl/k mN0gIDGFUx3UEIvRKbcXruVSoWRhcZtulBDlEl5dj6KXuASNDMUzHKKgmkKH8ffWps7Kt+tfdk IUTeEywLtG2fPRFdfKxnB1W9Asc3r2rvyGo7qt+YF7RVTuZUrQwWAZ6GqwuGVv4Th7vn7hY6MM obo=
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

The internal package config file for libxenlight reads (reformatted to avoid
exceeding the SMTP 998-character line length):

  Libs: -L${libdir}
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/evtchn
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/call
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/evtchn
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/gnttab
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/foreignmemory
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/call
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/devicemodel
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/ctrl
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/store
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/call
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/hypfs
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/evtchn
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/call
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/evtchn
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/gnttab
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/foreignmemory
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/call
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/devicemodel
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/ctrl
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/guest
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/light
  -lxenlight

Drop duplicate -rpath-link='s to turn it into the slightly-more-manageable:

  Libs: -L${libdir}
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/call
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/ctrl
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/devicemodel
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/evtchn
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/foreignmemory
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/gnttab
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/guest
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/hypfs
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/light
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/store
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toolcore
  
-Wl,-rpath-link=/local/security/xen.git/tools/libs/light/../../../tools/libs/toollog
  -lxenlight

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Ian Jackson <iwj@xxxxxxxxxxxxxx>
CC: Wei Liu <wl@xxxxxxx>
CC: Juergen Gross <jgross@xxxxxxxx>
---
 tools/Rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/Rules.mk b/tools/Rules.mk
index f61da81f4a..5d92ff0699 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -184,7 +184,7 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk 
$(PKG_CONFIG_DIR)
        echo "Description: $(PKG_CONFIG_DESC)"; \
        echo "Version: $(PKG_CONFIG_VERSION)"; \
        echo "Cflags: -I\$${includedir} $(CFLAGS_xeninclude)"; \
-       echo "Libs: -L\$${libdir} $(PKG_CONFIG_USELIBS) -l$(PKG_CONFIG_LIB)"; \
+       echo "Libs: -L\$${libdir} $(sort $(PKG_CONFIG_USELIBS)) 
-l$(PKG_CONFIG_LIB)"; \
        echo "Libs.private: $(PKG_CONFIG_LIBSPRIV)"; \
        echo "Requires.private: $(PKG_CONFIG_REQPRIV)"; \
        } > $@
-- 
2.11.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.