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.

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

Merge libdispatch-1462.0.4 #809

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Merge libdispatch-1462.0.4 #809

wants to merge 19 commits into from

Conversation

AZero13
Copy link
Contributor

@AZero13 AZero13 commented Dec 20, 2023

This took a bit of work to ensure every change that happened following the last merge was preserved, but I was eventually able to do it.

This brings libdispatch on par with macOS Sonoma!

AppleOSSDistributions and others added 18 commits October 6, 2021 05:21
Imported from libdispatch-84.5.tar.gz
Imported from libdispatch-187.5.tar.gz
Imported from libdispatch-228.18.tar.gz
Imported from libdispatch-339.1.9.tar.gz
Imported from libdispatch-442.1.4.tar.gz
Imported from libdispatch-500.1.5.tar.gz
Imported from libdispatch-501.20.1.tar.gz
Imported from libdispatch-703.1.4.tar.gz
Imported from libdispatch-913.1.6.tar.gz
Imported from libdispatch-1008.200.78.tar.gz
Imported from libdispatch-1173.0.3.tar.gz
Imported from libdispatch-1271.40.12.tar.gz
Imported from libdispatch-1324.41.2.tar.gz
Imported from libdispatch-1325.100.36.tar.gz
Imported from libdispatch-1412.tar.gz
Imported from libdispatch-1415.100.11.tar.gz
Imported from libdispatch-1462.0.4.tar.gz
src/shims/lock.h Outdated Show resolved Hide resolved
@triplef
Copy link
Contributor

triplef commented Dec 29, 2023

Thank you for trying to keep this repo up-to-date!

I just wanted to note that there are a couple errors when trying to build this branch on Android or Windows (and possibly other non-Apple platforms) due to new references to Apple-specific headers/defines:

  • workgroup_base.h:15:10: fatal error: 'mach/port.h' file not found
  • object.h:278:1: error: unknown type name 'OS_ASSUME_PTR_ABI_SINGLE_BEGIN'

And on Android there’s also this error:

In file included from /Users/me/libdispatch/src/transform.c:21:
In file included from /Users/me/libdispatch/src/internal.h:222:
In file included from /Users/me/libdispatch/os/workgroup_base.h:13:
In file included from /Users/me/Library/Android/sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/local/include/stdlib.h:31:
In file included from /Users/me/Library/Android/sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/stdlib.h:34:
In file included from /Users/me/Library/Android/sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/malloc.h:30:
/Users/me/Library/Android/sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/stdio.h:55:14: error: expected ';' after top level declarator
typedef off_t fpos_t;
             ^
/Users/me/Library/Android/sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/stdio.h:248:25: error: unknown type name 'fpos_t'; did you mean 'fpos64_t'?
int fgetpos(FILE* __fp, fpos_t* __pos);
                        ^
/Users/me/Library/Android/sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/stdio.h:56:17: note: 'fpos64_t' declared here
typedef off64_t fpos64_t;
                ^
/Users/me/Library/Android/sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/stdio.h:249:31: error: unknown type name 'fpos_t'; did you mean 'fpos64_t'?
int fsetpos(FILE* __fp, const fpos_t* __pos);
                              ^
/Users/me/Library/Android/sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/stdio.h:56:17: note: 'fpos64_t' declared here
typedef off64_t fpos64_t;
                ^

libdispatch-android-build.txt contains the full build instructions and logs for an Android build. Not sure if this is something that would have to be sorted out before a merge.

@AZero13
Copy link
Contributor Author

AZero13 commented Dec 30, 2023

I'm working on it and looking into it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants