From 0c63bae4814067c5928c571be3b2ed70a8c181b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 1 May 2024 15:19:00 +0200 Subject: [PATCH 1/3] pkgconfig: don't find packages when cross-compiling --- xmake/modules/package/manager/pkgconfig/find_package.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xmake/modules/package/manager/pkgconfig/find_package.lua b/xmake/modules/package/manager/pkgconfig/find_package.lua index 792f99c7a73..811c7b6ea35 100644 --- a/xmake/modules/package/manager/pkgconfig/find_package.lua +++ b/xmake/modules/package/manager/pkgconfig/find_package.lua @@ -31,6 +31,9 @@ function main(name, opt) -- init options opt = opt or {} + if is_cross(opt.plat, opt.arch) then + return + end -- get library info local libinfo = pkgconfig.libinfo(name, opt) From 217051f9240ed5c458853493802d294d6ea06ce0 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 1 May 2024 22:39:52 +0800 Subject: [PATCH 2/3] Update find_package.lua --- xmake/modules/package/manager/pkgconfig/find_package.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/xmake/modules/package/manager/pkgconfig/find_package.lua b/xmake/modules/package/manager/pkgconfig/find_package.lua index 811c7b6ea35..d8ec2a693ba 100644 --- a/xmake/modules/package/manager/pkgconfig/find_package.lua +++ b/xmake/modules/package/manager/pkgconfig/find_package.lua @@ -20,6 +20,7 @@ -- imports import("lib.detect.pkgconfig") +import("private.core.base.is_cross") import("package.manager.system.find_package", {alias = "find_package_from_system"}) -- find package from the pkg-config package manager From 4d8644f9d34ac5e250bc1b434f59d165693906e3 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 1 May 2024 22:40:09 +0800 Subject: [PATCH 3/3] Update find_package.lua --- xmake/modules/package/manager/pkgconfig/find_package.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/xmake/modules/package/manager/pkgconfig/find_package.lua b/xmake/modules/package/manager/pkgconfig/find_package.lua index d8ec2a693ba..041aa8629fc 100644 --- a/xmake/modules/package/manager/pkgconfig/find_package.lua +++ b/xmake/modules/package/manager/pkgconfig/find_package.lua @@ -29,8 +29,6 @@ import("package.manager.system.find_package", {alias = "find_package_from_system -- @param opt the options, e.g. {verbose = true, version = "1.12.x") -- function main(name, opt) - - -- init options opt = opt or {} if is_cross(opt.plat, opt.arch) then return