macOs various updates. #3578

devnexen · 2024-02-10T05:02:03Z

CI only for macOs arm64.
Fixing build issues for macOs arm64.
Adding macos cpu to arch api.

rustbot · 2024-02-10T05:02:07Z

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Cargo.toml

src/unix/bsd/apple/mod.rs

anacrolix · 2024-02-23T02:06:06Z

This looks great! Could we get it merged?

libc-test/build.rs

anacrolix · 2024-02-29T05:03:37Z

That's an unexpected error from the merge queue.

anacrolix · 2024-07-18T08:59:17Z

Woops, I think this got stuck again. Could we try to merge it again @JohnTitor @devnexen ?

anacrolix · 2024-07-26T05:02:28Z

Hello again, this is ready to go! Let me know if I can help in some way?

Amanieu · 2024-08-05T11:48:27Z

src/fixed_width_ints.rs

@@ -92,5 +92,10 @@ cfg_if! {

        // static_assert_eq!(core::mem::size_of::<__uint128_t>(), _SIZE_128);
        // static_assert_eq!(core::mem::align_of::<__uint128_t>(), _ALIGN_128);
+    } else if #[cfg(all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos")))] {


Prefer using target_vendor = "apple" instead.

I think I ve tried already in the past and now I try again I get this

error: `cfg(target_vendor)` is experimental and subject to change (see issue #29718) --> ../src/fixed_width_ints.rs:95:50 | 95 | } else if #[cfg(all(target_arch = "aarch64", target_vendor = "apple"))] { | ^^^^^^^^^^^^^^^^^^^^^^^ |

Which job does this fail on? It looks like this should have been stable since 1.33 rust-lang/rust#57465

Amanieu · 2024-08-05T16:35:43Z

CI is now failing on FreeBSD 15

.github/workflows/full_ci.yml

tgross35

A couple other small changes, plus https://github.com/rust-lang/libc/pull/3578/files#r1703994194 if it works. Then I think we can merge this with the other CI fixes.

tgross35 · 2024-08-08T17:40:02Z

libc-test/build.rs

+            // Removed in FreeBSD 15
+            "TDF_CANSWAP" | "TDF_SWAPINREQ" => true,
+
+            // Unaccessible in FreeBSD 15
+            "TDI_SWAPPED" | "P_SWAPPINGOUT" | "P_SWAPPINGIN" => true,
+


Do you mind moving the freebsd-specific changes to a separate commit so cherry picking is a bit easier?

you mean another PR ? usually we merge squashed commits ultimately.

No, just separate commits. Usually only messy history needs to get squashed (e.g. squash the docs fix), and this specifically won't since it will get merged with other CI fixes.

No worries if it's too much trouble.

(I'm just asking because I don't know what exactly needs to get cherry picked to the 0.2 branch to get that CI working)

should be ok in theory, l ll get to it soon-ish

tgross35 · 2024-08-08T17:42:43Z

src/fixed_width_ints.rs

+        /// C __int128_t (alternate name for [__int128][])
+        pub type __int128_t = i128;
+        /// C __uint128_t (alternate name for [__uint128][])
+        pub type __uint128_t = u128;


__int128 and __uint128 aren't defined in this branch of the cfg.

Suggested change

/// C __int128_t (alternate name for [__int128][])

pub type __int128_t = i128;

/// C __uint128_t (alternate name for [__uint128][])

pub type __uint128_t = u128;

/// C `__int128_t`

pub type __int128_t = i128;

/// C `__uint128_t`

pub type __uint128_t = u128;

.github/workflows/full_ci.yml

- CI only for macOs arm64. - Fixing build issues for macOs arm64. - Adding macos cpu to arch api.

tgross35 · 2024-08-12T10:35:17Z

This was merged via #3797.

anacrolix · 2024-08-13T01:48:55Z

Thank you!

rustbot assigned JohnTitor Feb 10, 2024

rustbot added the S-waiting-on-review label Feb 10, 2024

anacrolix mentioned this pull request Feb 11, 2024

CI: trying out macos 14 image (which is arm64). #3575

Closed

devnexen force-pushed the macos_arm64_upd branch from cba5173 to e721608 Compare February 17, 2024 17:14

JohnTitor reviewed Feb 17, 2024

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

src/unix/bsd/apple/mod.rs Outdated Show resolved Hide resolved

devnexen force-pushed the macos_arm64_upd branch from e721608 to 51100ae Compare February 17, 2024 20:17

JohnTitor reviewed Feb 18, 2024

View reviewed changes

src/unix/bsd/apple/mod.rs Outdated Show resolved Hide resolved

devnexen force-pushed the macos_arm64_upd branch from 51100ae to b101560 Compare February 18, 2024 13:23

JohnTitor reviewed Feb 25, 2024

View reviewed changes

libc-test/build.rs Outdated Show resolved Hide resolved

devnexen force-pushed the macos_arm64_upd branch from b101560 to 36c8345 Compare February 25, 2024 10:14

JohnTitor approved these changes Feb 28, 2024

View reviewed changes

JohnTitor added this pull request to the merge queue Feb 28, 2024

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 28, 2024

devnexen force-pushed the macos_arm64_upd branch from f144cb7 to 9058e77 Compare February 29, 2024 19:13

devnexen force-pushed the macos_arm64_upd branch from 9058e77 to 1a8e6f4 Compare July 18, 2024 09:01

anacrolix mentioned this pull request Jul 18, 2024

Add fcntl OFD commands for macOS #3563

Merged

Amanieu reviewed Aug 5, 2024

View reviewed changes

Amanieu added this pull request to the merge queue Aug 5, 2024

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 5, 2024

devnexen force-pushed the macos_arm64_upd branch from 1a8e6f4 to eeeea01 Compare August 5, 2024 22:38

tgross35 mentioned this pull request Aug 6, 2024

Combined CI fixes #3795

Closed

tgross35 reviewed Aug 6, 2024

View reviewed changes

.github/workflows/full_ci.yml Show resolved Hide resolved

tgross35 requested changes Aug 8, 2024

View reviewed changes

macOs various updates.

5ef157d

- CI only for macOs arm64. - Fixing build issues for macOs arm64. - Adding macos cpu to arch api.

Fix FreeBSD 15 CI

fa686c1

devnexen force-pushed the macos_arm64_upd branch from eeeea01 to fa686c1 Compare August 8, 2024 19:05

This was referenced Aug 8, 2024

Combined CI fixes (followup) #3796

Closed

Combined CI fixes #3797

Merged

tgross35 closed this Aug 12, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

macOs various updates. #3578

macOs various updates. #3578

devnexen commented Feb 10, 2024

rustbot commented Feb 10, 2024

anacrolix commented Feb 23, 2024

anacrolix commented Feb 29, 2024

anacrolix commented Jul 18, 2024

anacrolix commented Jul 26, 2024

Amanieu Aug 5, 2024

devnexen Aug 5, 2024

tgross35 Aug 7, 2024

Amanieu commented Aug 5, 2024

tgross35 left a comment

tgross35 Aug 8, 2024

devnexen Aug 8, 2024

tgross35 Aug 8, 2024 •

edited

Loading

devnexen Aug 8, 2024

tgross35 Aug 8, 2024

devnexen Aug 8, 2024

tgross35 commented Aug 12, 2024

anacrolix commented Aug 13, 2024

macOs various updates. #3578

macOs various updates. #3578

Conversation

devnexen commented Feb 10, 2024

rustbot commented Feb 10, 2024

anacrolix commented Feb 23, 2024

anacrolix commented Feb 29, 2024

anacrolix commented Jul 18, 2024

anacrolix commented Jul 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Amanieu commented Aug 5, 2024

tgross35 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tgross35 Aug 8, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tgross35 commented Aug 12, 2024

anacrolix commented Aug 13, 2024

tgross35 Aug 8, 2024 •

edited

Loading