check pkgconfig

xmake-io · Feb 5, 2025 · 1c8d2db · 1c8d2db
1 parent f275ffb
commit 1c8d2db
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/packages/l/libxkbcommon/xmake.lua b/packages/l/libxkbcommon/xmake.lua
@@ -46,7 +46,7 @@ package("libxkbcommon")
         import("package.tools.meson").install(package, configs)
 
         package:addenv("PATH", "bin")
-        package:addenv("PKG_CONFIG_PATH", path.join(package:installdir("lib"), "pkgconfig"))
+        package:addenv("PKG_CONFIG_PATH", path.join("lib", "pkgconfig"))
     end)
 
     on_test(function (package)

diff --git a/packages/o/open3d/xmake.lua b/packages/o/open3d/xmake.lua
@@ -91,6 +91,9 @@ package("open3d")
         if package:is_plat("windows") then
             import("package.tools.cmake").install(package, configs, {buildir = os.tmpfile() .. ".dir"})
         elseif package:is_plat("linux") then
+            local envs = import("package.tools.cmake").buildenvs(package, {packagedeps = {"libxrandr", "libxrender", "libxinerama", "libxcursor", "libxfixes", "libxext", "libxi", "libx11", "libxkbcommon", "wayland", "wayland-protocol"}})
+            print(envs)
+            print("Open3d PKG_CONFIG_PATH: ", envs.PKG_CONFIG_PATH)
             import("package.tools.cmake").install(package, configs, {packagedeps = {"libxrandr", "libxrender", "libxinerama", "libxcursor", "libxfixes", "libxext", "libxi", "libx11", "libxkbcommon", "wayland", "wayland-protocol"}})
         else
             import("package.tools.cmake").install(package, configs)

diff --git a/packages/w/wayland/xmake.lua b/packages/w/wayland/xmake.lua
@@ -31,17 +31,21 @@ package("wayland")
         os.mkdir(package:installdir("share", "aclocal"))
 
         -- build wayland
-        local configs = {"-Ddocumentation=false", "-Dc_link_args=-lm"}
-        table.insert(configs, "--libdir=lib")
+        local configs = {"-Ddocumentation=false", "-Dc_link_args=-lm", "--libdir=lib"}
+        table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
         local envs = meson.buildenvs(package)
         envs.LD_LIBRARY_PATH = path.joinenv(table.join(LD_LIBRARY_PATH, envs.LD_LIBRARY_PATH))
         envs.PKG_CONFIG_PATH = path.joinenv(table.join(PKG_CONFIG_PATH, envs.PKG_CONFIG_PATH))
         envs.ACLOCAL_PATH    = path.joinenv(table.join(ACLOCAL_PATH, envs.ACLOCAL_PATH))
         envs.ACLOCAL         = ACLOCAL
         meson.install(package, configs, {envs = envs})
+
+        package:addenv("PKG_CONFIG_PATH", path.join("lib", "pkgconfig"))
+        package:addenv("PKG_CONFIG_PATH", path.join("share", "pkgconfig"))
     end)
 
     on_test(function (package)
         os.vrun("wayland-scanner --version")
+        assert(package:check_importfiles("pkgconfig::wayland-client"))
         assert(package:has_cfuncs("wl_list_init", {includes = "wayland-util.h"}))
     end)