Skip to content

Commit

Permalink
Try to enable x11 on cross
Browse files Browse the repository at this point in the history
  • Loading branch information
SirLynix committed Feb 3, 2025
1 parent d3cd88d commit 2a4d4b4
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion packages/l/libpthread-stubs/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package("libpthread-stubs")

add_deps("pkg-config")

on_install("macosx", "linux", "bsd", function (package)
on_install("macosx", "linux", "bsd", "cross", function (package)
import("package.tools.autoconf").install(package)
end)

Expand Down
6 changes: 3 additions & 3 deletions packages/l/libx11/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ package("libx11")
add_extsources("brew::libx11")
end

if is_plat("linux", "bsd") then
if is_plat("linux", "bsd", "cross") then
add_syslinks("dl")
end

add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})

if is_plat("macosx", "linux", "bsd") then
if is_plat("macosx", "linux", "bsd", "cross") then
add_deps("pkg-config", "util-macros", "xtrans", "libxcb", "xorgproto")
end
if is_plat("macosx") then
-- fix sed: RE error: illegal byte sequence
add_deps("gnu-sed")
end

on_install("macosx", "linux", "bsd", function (package)
on_install("macosx", "linux", "bsd", "cross", function (package)
local configs = {"--sysconfdir=" .. package:installdir("etc"),
"--localstatedir=" .. package:installdir("var"),
"--disable-dependency-tracking",
Expand Down
4 changes: 2 additions & 2 deletions packages/l/libxau/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ package("libxau")
add_extsources("apt::libxau-dev", "pacman::libxau")
end

if is_plat("macosx", "linux", "bsd") then
if is_plat("macosx", "linux", "bsd", "cross") then
add_deps("pkg-config", "util-macros", "xorgproto")
end

on_install("macosx", "linux", "bsd", function (package)
on_install("macosx", "linux", "bsd", "cross", function (package)
local configs = {"--sysconfdir=" .. package:installdir("etc"),
"--localstatedir=" .. package:installdir("var"),
"--disable-dependency-tracking",
Expand Down
4 changes: 2 additions & 2 deletions packages/l/libxcb/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ package("libxcb")
add_extsources("apt::libxcb1-dev", "pacman::libxcb")
end

if is_plat("macosx", "linux", "bsd") then
if is_plat("macosx", "linux", "bsd", "cross") then
add_deps("pkg-config", "python 3.x", {kind = "binary"})
add_deps("xcb-proto", "libpthread-stubs", "libxau", "libxdmcp")
end
Expand All @@ -59,7 +59,7 @@ package("libxcb")
end
end)

on_install("macosx", "linux", "bsd", function (package)
on_install("macosx", "linux", "bsd", "cross", function (package)
local configs = {"--sysconfdir=" .. package:installdir("etc"),
"--localstatedir=" .. package:installdir("var"),
"--disable-dependency-tracking",
Expand Down
4 changes: 2 additions & 2 deletions packages/l/libxdmcp/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ package("libxdmcp")
add_extsources("apt::libxdmcp-dev", "pacman::libxmdcp")
end

if is_plat("macosx", "linux", "bsd") then
if is_plat("macosx", "linux", "bsd", "cross") then
add_deps("pkg-config", "xorgproto")
end

on_install("macosx", "linux", "bsd", function (package)
on_install("macosx", "linux", "bsd", "cross", function (package)
local configs = {"--sysconfdir=" .. package:installdir("etc"),
"--localstatedir=" .. package:installdir("var"),
"--disable-dependency-tracking",
Expand Down
2 changes: 1 addition & 1 deletion packages/u/util-macros/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package("util-macros")

add_deps("pkg-config")

on_install("macosx", "linux", "bsd", function (package)
on_install("macosx", "linux", "bsd", "cross", function (package)
local configs = {"--sysconfdir=" .. package:installdir("etc"),
"--localstatedir=" .. package:installdir("var")}
import("package.tools.autoconf").install(package, configs)
Expand Down
4 changes: 2 additions & 2 deletions packages/x/xtrans/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ package("xtrans")
add_extsources("apt::xtrans-dev", "pacman::xtrans")
end

if is_plat("macosx", "linux", "bsd") then
if is_plat("macosx", "linux", "bsd", "cross") then
add_deps("pkg-config", "util-macros", "xorgproto")
end

on_install("macosx", "linux", "bsd", function (package)
on_install("macosx", "linux", "bsd", "cross", function (package)
local configs = {"--sysconfdir=" .. package:installdir("etc"),
"--localstatedir=" .. package:installdir("var"),
"--disable-dependency-tracking",
Expand Down

0 comments on commit 2a4d4b4

Please sign in to comment.