Several updates - see individual commits #100
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This avoids repeating the symbol lookup on every call. TESTED: Passes tests on all platforms.
It's a silly waste of time to use the string-lookup version of sysconf() rather than using the numeric version, even though that's what Apple's code does. Also adds comment explaining 32-bit issues. Also, since the "i386" bug in Apple's code is really a 32-bit bug, the feature-flag condition is adjusted to be more honest. This has no actual effect, since i386 is the only supported 32-bit processor in the relevant OS versions. This removes the only reference to __MPLS_APPLE_I386__, but the definition is retained in case it's useful in the future. TESTED: Passes tests on all platforms.
This avoids repeatedly looking up the symbol for the OS call. Also cleans up indentation. TESTED: Passes tests on all platforms.
TESTED: Message is now correct.
This creates a simple Makefile for C programs, with architecture(s) derived from macports.conf. TESTED: Makefile has proper architectures with all options on all platforms.
This brings in the sources for Apple's 10.5 C-based 'which' (from FreeBSD), verbatim @shell_cmds-116. A future commit will use them.
Provides a dummy definition of __FBSDID to avoid compile errors, without deleting the ID string inherited from FreeBSD. TESTED: Builds now work on 10.4, including universal builds where applicable.
This is used to build a program with the same architecture(s) as a specified program (default /usr/bin/true).
Unlike the 10.5+ 'which' command, which is a C program, the OS-supplied 10.4 version is a csh script, with some deficiencies. Since 2019, legacy-support has been supplying a patched version of the csh script correcting some, but not all, deficiencies. In particular, the replacement version doesn't implement the '-a' option, without providing an informative error message. This change replaces the patched csh script with a build of the 10.5 version. For consistency, it has the same universality as the Apple-supplied programs, regardless of whether legacy-support is being built universal in general. Specifically, it uses the new binarchs tool to copy the architectures from /usr/bin/true, since full universal builds don't work on 10.4 ppc. TESTED: Built and tested with all option combinations. Tested the updated install target.
This patched csh script has been replaced by a build of the C version.
mascguy
approved these changes
Nov 16, 2024
|
@mascguy |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Notably:
whichfor 10.4 is now 10.5+ version.Tested, both from repo and via Portfile, on: