From 0880e01abb9fb107d274276e5dfb7a0576a53b0b Mon Sep 17 00:00:00 2001 From: SuperSodaSea Date: Thu, 29 Feb 2024 22:05:43 +0800 Subject: [PATCH 1/2] Remove extra spaces from generated pkgconfig file --- xmake/modules/target/action/install/pkgconfig_importfiles.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/modules/target/action/install/pkgconfig_importfiles.lua b/xmake/modules/target/action/install/pkgconfig_importfiles.lua index 979feaee235..aa3d6e63225 100644 --- a/xmake/modules/target/action/install/pkgconfig_importfiles.lua +++ b/xmake/modules/target/action/install/pkgconfig_importfiles.lua @@ -79,8 +79,8 @@ function main(target, opt) if version then file:print("Version: %s", version) end - file:print("Libs: %s", libs) - file:print("Cflags: %s", cflags) + file:print("Libs:%s", libs) + file:print("Cflags:%s", cflags) file:close() end end From 4fcd63bf9dc9650ce96f720f1ffc85c2a8a3ab93 Mon Sep 17 00:00:00 2001 From: SuperSodaSea Date: Fri, 1 Mar 2024 00:32:58 +0800 Subject: [PATCH 2/2] Use trim() instead --- .../modules/target/action/install/pkgconfig_importfiles.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xmake/modules/target/action/install/pkgconfig_importfiles.lua b/xmake/modules/target/action/install/pkgconfig_importfiles.lua index aa3d6e63225..65da320850e 100644 --- a/xmake/modules/target/action/install/pkgconfig_importfiles.lua +++ b/xmake/modules/target/action/install/pkgconfig_importfiles.lua @@ -52,6 +52,7 @@ function main(target, opt) libs = libs .. " -l" .. link end end + libs = libs:trim() -- get cflags local cflags = "" @@ -61,6 +62,7 @@ function main(target, opt) end end cflags = cflags .. " -I${includedir}" + cflags = cflags:trim() -- trace vprint("generating %s ..", pcfile) @@ -79,8 +81,8 @@ function main(target, opt) if version then file:print("Version: %s", version) end - file:print("Libs:%s", libs) - file:print("Cflags:%s", cflags) + file:print("Libs: %s", libs) + file:print("Cflags: %s", cflags) file:close() end end