Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing Linux platform triples in autoconf tool. #5548

Merged
merged 4 commits into from
Sep 1, 2024
Merged

Add missing Linux platform triples in autoconf tool. #5548

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e12ef89
make autoconf tool to use is_cross to determine whether it is cross-c…
Redbeanw44602 Aug 30, 2024
71d380e
add missing linux platform triples.
Redbeanw44602 Aug 30, 2024
ea1eccb
Update autoconf.lua
waruqi Aug 31, 2024
a81b8dc
Update autoconf.lua
waruqi Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions xmake/modules/package/tools/autoconf.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,6 @@ function _get_msvc_runenvs(package)
return os.joinenvs(_get_msvc(package):runenvs())
end

-- is cross compilation?
function _is_cross_compilation(package)
if not package:is_plat(os.subhost()) then
return true
end
if package:is_plat("macosx") and not package:is_arch(os.subarch()) then
return true
end
return false
end

-- get memcache
function _memcache()
return memcache.cache("package.tools.autoconf")
Expand Down Expand Up @@ -115,7 +104,7 @@ function _get_configs(package, configs)
table.insert(configs, "--prefix=" .. _translate_paths(package:installdir()))

-- add host for cross-complation
if not configs.host and _is_cross_compilation(package) then
if not configs.host and package:is_cross() then
if package:is_plat("iphoneos", "macosx") then
local triples =
{
Expand Down Expand Up @@ -150,6 +139,20 @@ function _get_configs(package, configs)
x86_64 = "x86_64-w64-mingw32"
}
table.insert(configs, "--host=" .. (triples[package:arch()] or triples.i386))
elseif package:is_plat("linux") then
local triples =
{
["arm64-v8a"] = "aarch64-linux-gnu",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

还有 arm64

Copy link
Contributor Author

@Redbeanw44602 Redbeanw44602 Aug 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xmake/xmake/platforms/linux/xmake.lua

Line 24 in 47e72b2

set_archs("i386", "x86_64", "armv7", "armv7s", "arm64-v8a", "mips", "mips64", "mipsel", "mips64el", "loong64")

linux 下面好像并没有叫 arm64 的处理器架构，只有 arm64-v8a。

i386 = "i686-linux-gnu",
x86_64 = "x86_64-linux-gnu",
armv7 = "arm-linux-gnueabihf",
mips = "mips-linux-gnu",
mips64 = "mips64-linux-gnu",
mipsel = "mipsel-linux-gnu",
mips64el = "mips64el-linux-gnu",
loong64 = "loongarch64-linux-gnu"
}
table.insert(configs, "--host=" .. (triples[package:arch()] or triples.i386))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

现在 i386 很少用了，默认改成 x86_64

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

看上面写的都是 i386 所以就写 i386 了，要不都改过来？

elseif package:is_plat("cross") and package:targetos() then
local host = package:arch()
if package:is_arch("arm64") then
Expand Down Expand Up @@ -240,7 +243,7 @@ function buildenvs(package, opt)
local envs = {}
local cross = false
local cflags, cxxflags, cppflags, asflags, ldflags, shflags, arflags
if not _is_cross_compilation(package) and not package:config("toolchains") then
if not package:is_cross() and not package:config("toolchains") then
cppflags = {}
cflags = table.join(table.wrap(package:config("cxflags")), package:config("cflags"))
cxxflags = table.join(table.wrap(package:config("cxflags")), package:config("cxxflags"))
Expand Down
29 changes: 16 additions & 13 deletions xmake/modules/private/action/trybuild/autoconf.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ end
function _get_buildenvs()
local envs = {}
local cross = false
if not _is_cross_compilation() then
if not is_cross() then
local cflags = table.join(table.wrap(_get_buildenv("cxflags")), _get_buildenv("cflags"))
local cxxflags = table.join(table.wrap(_get_buildenv("cxflags")), _get_buildenv("cxxflags"))
local asflags = table.copy(table.wrap(_get_buildenv("asflags")))
Expand Down Expand Up @@ -174,17 +174,6 @@ function _get_buildenvs()
return envs
end

-- is cross compilation?
function _is_cross_compilation()
if not is_plat(os.subhost()) then
return true
end
if is_plat("macosx") and not is_arch(os.subarch()) then
return true
end
return false
end

-- get configs
function _get_configs(artifacts_dir)

Expand All @@ -201,7 +190,7 @@ function _get_configs(artifacts_dir)
end

-- add host for cross-complation
if _is_cross_compilation() then
if is_cross() then
if is_plat("iphoneos", "macosx") then
local triples =
{
Expand Down Expand Up @@ -236,6 +225,20 @@ function _get_configs(artifacts_dir)
x86_64 = "x86_64-w64-mingw32"
}
table.insert(configs, "--host=" .. (triples[config.arch()] or triples.i386))
elseif is_plat("linux") then
local triples =
{
["arm64-v8a"] = "aarch64-linux-gnu",
i386 = "i686-linux-gnu",
x86_64 = "x86_64-linux-gnu",
armv7 = "arm-linux-gnueabihf",
mips = "mips-linux-gnu",
mips64 = "mips64-linux-gnu",
mipsel = "mipsel-linux-gnu",
mips64el = "mips64el-linux-gnu",
loong64 = "loongarch64-linux-gnu"
}
table.insert(configs, "--host=" .. (triples[config.arch()] or triples.i386))
elseif is_plat("cross") then
local host = config.arch()
if is_arch("arm64") then
Expand Down
Loading