macos universal2

[Freed-Wu]

Is your feature request related to a problem? Please describe.

macos has a platform named universal2, suppot both arm64 and x86_64.

https://scikit-build-core.readthedocs.io/en/latest/guide/crosscompile.html#intel-to-applesilicon

Now xmake f -a XXX doesn't contain it.

Describe the solution you'd like

    -a ARCH, --arch=ARCH                   Compile for the given architecture. (default: auto)
                                               - macosx: x86_64 arm64 universal2

Describe alternatives you've considered

No response

Additional context

No response

[waruqi]

https://xmake.io/#/plugin/builtin_plugins?id=builtin-macros

$ xmake macro package -p iphoneos -a "arm64,x86_64"

[Freed-Wu]

So for non universal2 platforms, we should run:

xmake config -a x86_64
xmake build
xmake install -o /a/path

For universal2:

xmake m package -a x86_64,arm64
xmake build
xmake install -o /a/path

Right?

[Freed-Wu]

Looks like xmake package will call xmake build

xmake m package -a x86_64,arm64
xmake install -o /a/path

We can -f to pass command to xmake config, Can we pass command to xmake build?

[theo-dep]

Hi,

I am testing the command xmake macro package -p macosx -a "arm64,x86_64" with the minimal example xmake create -l c -P ./hello.

The smallest macOS build don't have an output path like format("%s/%s.pkg/*/*/lib/*", outputdir, target:name()) but like format("%s/%s/*/*", outputdir, plat).

Now, the build is correct :) :

lipo -archs build/macosx/universal/hello
x86_64 arm64

platform.lua didn't work in any case or I miss something. What about bundle and framework? Is %s.pkg made for watchOS? I only know iOS and macOS platforms...

diff --git a/platform.ori.lua b/platform.lua
index 0049559..c3f882a 100644
--- a/platform.ori.lua
+++ b/platform.lua
@@ -102,20 +102,21 @@ function main(argv)
         end
         for _, target in ipairs(targets) do
             local modes = {}
-            for _, modedir in ipairs(os.dirs(format("%s/%s.pkg/*/*/lib/*", outputdir, target:name()))) do
+            for _, modedir in ipairs(os.dirs(format("%s/%s/*/*", outputdir, plat))) do
                 table.insert(modes, path.basename(modedir))
             end
             for _, mode in ipairs(table.unique(modes)) do
                 local lipoargs = nil
                 for _, arch in ipairs(archs) do
-                    local archfile = format("%s/%s.pkg/%s/%s/lib/%s/%s", outputdir, target:name(), plat, arch:trim(), mode, path.filename(target:targetfile()))
+                    local archfile = format("%s/%s/%s/%s/%s", outputdir, plat, arch:trim(), mode, path.filename(target:targetfile()))
                     if os.isfile(archfile) then
                         lipoargs = format("%s -arch %s %s", lipoargs or "", arch, archfile)
                     end
                 end
                 if lipoargs then
-                    lipoargs = format("-create %s -output %s/%s.pkg/%s/universal/lib/%s/%s", lipoargs, outputdir, target:name(), plat, mode, path.filename(target:targetfile()))
-                    os.mkdir(format("%s/%s.pkg/%s/universal/lib/%s", outputdir, target:name(), plat, mode))
+                    lipooutdir = format("%s/%s/universal/%s", outputdir, plat, mode)
+                    os.mkdir(lipooutdir)
+                    lipoargs = format("-create %s -output %s/%s", lipoargs, lipooutdir, path.filename(target:targetfile()))
                     os.execv(os.programfile(), {"l", "lipo", lipoargs})
                 end
             end

platform.diff.txt

[Freed-Wu]

In my test, the result miss arm64 binary.

xmake macro -y package -a arm64,x86_64 -f
xmake install -y -o /var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/tmpia9e3d85
Successfully built xmake_wheel-2.9.9-py3-none-macosx_14_0_universal2.whl
                                                            ✓ 5.66s
Repairing wheel...
+ delocate-wheel --require-archs x86_64,arm64 -w /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/cibw-run-9nencoj5/cp312-macosx_universal2/repaired_wheel -v /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/cibw-run-9nencoj5/cp312-macosx_universal2/built_wheel/xmake_wheel-2.9.9-py3-none-macosx_14_0_universal2.whl
Fixing: /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/cibw-run-9nencoj5/cp312-macosx_universal2/built_wheel/xmake_wheel-2.9.9-py3-none-macosx_14_0_universal2.whl
Traceback (most recent call last):
  File "/private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/cibw-run-9nencoj5/cp312-macosx_universal2/build/venv/bin/delocate-wheel", line 10, in <module>
    sys.exit(main())
             ^^^^^^
  File "/private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/cibw-run-9nencoj5/cp312-macosx_universal2/build/venv/lib/python3.12/site-packages/delocate/cmd/delocate_wheel.py", line 115, in main
    copied = delocate_wheel(
             ^^^^^^^^^^^^^^^
  File "/private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/cibw-run-9nencoj5/cp312-macosx_universal2/build/venv/lib/python3.12/site-packages/delocate/delocating.py", line 1106, in delocate_wheel
    out_wheel_fixed = _check_and_update_wheel_name(
                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/cibw-run-9nencoj5/cp312-macosx_universal2/build/venv/lib/python3.12/site-packages/delocate/delocating.py", line 917, in _check_and_update_wheel_name
    new_name, problematic_files = _calculate_minimum_wheel_name(
                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/cibw-run-9nencoj5/cp312-macosx_universal2/build/venv/lib/python3.12/site-packages/delocate/delocating.py", line 851, in _calculate_minimum_wheel_name
    raise DelocationError(
delocate.libsana.DelocationError: Failed to find any binary with the required architecture: 'arm64'

https://github.com/xmake-io/xmake-wheel/actions/runs/15252081922/job/42891107979

PS: related issue: meson also miss support for universal2

[waruqi]

xmake macro package is an independent plugin command and has nothing to do with xmake install