Skip to contentSkip to conversation

tools/libs: Simplify internal *.pc files

PATCH In review Andrew Cooper 2 participants 3 messages Nov 25, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/libs: Simplify internal *.pc files

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

---
CC: Ian Jackson <[email protected]>
CC: Wei Liu <[email protected]>
CC: Juergen Gross <[email protected]>

---
 tools/Rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/Rules.mk +1 -1
index f61da81f4a..5d92ff0699 100644
@@ -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)"; \
 	} > $@
Signature · 1 line
2.11.0
Reviewed-by on v1 1/1
#1 lore raw

Hi Andrew,

Quoted 83 lines · Andrew Cooper

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

Quoted 1 line

Nice reduction of the output :-)

Cheers
Bertrand

Quoted 25 lines

---
CC: Ian Jackson <[email protected]>
CC: Wei Liu <[email protected]>
CC: Juergen Gross <[email protected]>
---
tools/Rules.mk | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
tools/Rules.mk +1 -1
index f61da81f4a..5d92ff0699 100644
@@ -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)"; \
 	} > $@
Signature · 1 line
2.11.0
#2 lore raw
In reply to Andrew Cooper

tools/Rules.mk $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) · line 190

Quoted 13 lines · Andrew Cooper
tools/Rules.mk +1 -1
index f61da81f4a..5d92ff0699 100644
@@ -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)"; \
 	} > $@

Actually, it occurs to me that this would be better in libs.mk as

PKG_CONFIG_USELIBS := $(sort $(SHLIB_libxen$(LIBNAME)))

in case we gain any further uses of PKG_CONFIG_USELIBS

~Andrew