Portfile preliminary test 1 - #1
Open
Dave-Allured wants to merge 1 commit into
Open
Conversation
Dave-Allured
pushed a commit
that referenced
this pull request
Mar 3, 2024
This makes three changes to the patches for 10.4 and 10.5: 1) In the G3 patch, it removes the ppc7400 reference that was never actually used, rather than updating it. It still fixes the case that is actually used. 2) It removes the patch for i386 assembler that has been (approximately) incorporated upstream since v3.4.5. The collision with this patch was the reason for the patch failure. 3) For the gcc 4.2 test-build fix, it replaces the conditionally applied patchfile with an unconditional patch controlled by an environment variable, thereby keeping the source code consistent across OS versions. This new environment variable is now defined by the Portfile when the compiler is gcc 4.2. The patches for #1 and #3 are now in a single unified patchfile. Closes: https://trac.macports.org/ticket/69380 TESTED: Tested on 10.4-10.5 ppc, 10.5-10.6 ppc (x86_64 Rosetta), 10.4-10.6 i386, 10.4-12.x x86_64, and 11.x-14.x arm64. Now builds and passes at least some tests on all tested platforms, except 10.4 ppc +universal. Test behavior on 10.6+ is essentially unchanged. Tests on 10.4 and 10.5 have a few additional failures since v3.4.4 (the last version that built successfully) due to new tests having been added.
Dave-Allured
added a commit
that referenced
this pull request
Nov 1, 2025
Dave-Allured
pushed a commit
that referenced
this pull request
Aug 4, 2026
add-unistd-include.patch was written with CRLF line endings on every
line, including the ---/+++/@@ headers. Older versions of patch(1) see
DOS line endings in the headers, report "(Stripping trailing CRs from
patch.)" and strip the CRs from the context lines too. Since editline.c
itself has CRLF line endings, the stripped context no longer matches and
both hunks fail:
(Stripping trailing CRs from patch.)
patching file editline/editline.c
Hunk #1 FAILED at 63.
Hunk #2 FAILED at 156.
2 out of 2 hunks FAILED
Regenerate the patch with diff(1) so the headers use LF and only the
content lines carry CRLF, matching the existing find-va_copy.patch which
applies correctly on every platform.
Also drop the legacy K&R declarations of read() and write() outright
instead of guarding them with the private _UNISTD_H_ macro, since
<unistd.h> supplies the correct prototypes on all supported OS versions.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Description
Type(s)
Tested on
macOS x.y
Xcode x.y
Verification
Have you
port lint --nitpick?sudo port test?sudo port -vst install?