-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Allow to build main on Intel macOS 26 #1927
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
base: main
Are you sure you want to change the base?
Conversation
|
Generally looks good. For thr_printf.c we could perhaps introduce |
|
Yes, I agree. I've already introduced the __nonstring define in cdefs.h. The only question is about the style of the usage: a) or b) is preferred? |
|
Thank you for taking the time to contribute to FreeBSD! |
|
and I've just found now @arichardson 's PR: #1847 which mostly contains my fixes |
arichardson
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanka for this contribution. For the nonstring I already have some approved phabricator revisions that I just need to land. I plan to do so tomorrow.
|
Apologies for being slow in landing these, other priorities have taken up all my time lately |
|
@arichardson do you need any help? |
|
I will rework this branch to only contain the fixes for Intel mac, I will test your changes ontop of the intel fix |
Without this the libcrypto build fails with undefined symbols build error. The corresponding EC functions doesn't get's picked up at secure/lib/libcrypto/Makefile:237 due the missing MACHINE_ABI define. Signed-off-by: Oliver Pinter <oliver.pntr+freebsd@gmail.com>
found during crossbuild on macOS Signed-off-by: Oliver Pinter <oliver.pntr+freebsd@gmail.com>
|
@emaste could you please take a look again? |
| /src.conf | ||
|
|
||
| # for crossbuilds on macOS | ||
| tools/build/test-includes |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm this one is weird, we shouldn't be generating any files here, everything should be in the build dir.
I committed my initial set of changes and will rebase the remaining ones soon. This is enough to pass the host tools phase, but the buildworld phase still needs the additional fixes for latest clang. |
|
Okay I've updated #1847, hopefully I can land the rest of the changes soon. |
faster repro: ``` op@opmbp src % ../build-gen.sh V=0 -C usr.bin/vi/catalog/ /usr/local/bin/bmake bmake: don't know how to make dutch.base. Stop bmake: stopped making "all" in /Users/op/data/git/git.FreeBSD.org/freebsd/src/usr.bin/vi/catalog ``` Signed-off-by: Oliver Pinter <oliver.pntr+freebsd@gmail.com>
|
Seems like vi/catalog is also weird: |
| # Currently all 64-bit FreeBSD architectures include 64 in their name | ||
| # (see arch(7)). We need a special case for cross-building from macOS | ||
| # (which uses arm64/arm). | ||
| # (which uses arm64/arm and x86_64/amd64). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But both x86_64 and amd64 match 64. This was only here for Apple Silicon because MACHINE_ARCH is arm, no 64 in it.
|
|
||
| PACKAGE=vi | ||
| V= ${.CURDIR}/../../../contrib/nvi | ||
| VI= ${.CURDIR}/../../../contrib/nvi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is entirely unrelated to building on Intel macOS?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(and V=0 is not how you silence building FreeBSD, that's you assuming a Linux-ism applies to building FreeBSD and blindly setting a random variable for the build; if you want the FreeBSD build to be quieter, use -s, or -ss for even quieter)
jrtc27
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All hunks are contested
|
How are you building in order to get that result? |

Compiling FreeBSD main (16-CURRENT) on Intel MBP with latest macOS trigger build errors.