Fixes #29792
Adds a note to depends/README.md that on older versions of macOS you may need to use GNU patch. I phrased as a troubleshooting hint, rather than make it a default recommendation, because:
The instructions in build-osx.md don’t even mention depends, so I don’t touch those here.
Fixes #29792
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For detailed information about the code coverage, see the test coverage report.
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| Concept ACK | laanwj |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
brew list and don’t have any entries for “patch” or “gpatch” and when I run which patch, it is in /usr/bin, so seems like it is just the default program?
Seems weird that this suddenly pops up now after having worked for a long time?
I agree. It’s worked fine for me too on this machine back in the day, say 2017-2019. Replacing the built-in patch with GNU patch immediately fixed it, so it does seem related.
say 2017-2019.
So it stopped working in 2019, but you only reported it in 2024?
Given that there are 3 machines here, 2 where it always has worked, and continues to work, and one where it used to work, and now no-longer does, it would seem more likely that something has changed on your machine?
So it stopped working in 2019, but you only reported it in 2024?
No, I bought a faster machine in 2019 which I’ve been using for most compilation work. I may have run a depends build on the old machine since then, but I don’t know when the last time was.
Since Apple no longer ships new macOS versions for the 2017 iMac it’s become useful for backwards compatibility tests. But that’s only been since this fall.
it would seem more likely that something has changed on your machine?
Possible.
I’ll mark this draft for now, let’s see if someone else runs into it.
On both machines:
0/usr/bin/patch --version
1patch 2.0-12u11-Apple
On the old machine:
0shasum -a 256 /usr/bin/patch
11c7648162c11d32aa0ee1a05a948a8a548e4a9336106704a43ab986f718efb88 /usr/bin/patch
2
3% codesign -dv --verbose=4 /usr/bin/patch
4Executable=/usr/bin/patch
5Identifier=com.apple.patch
6Format=Mach-O universal (x86_64 arm64e)
7CodeDirectory v=20400 size=872 flags=0x0(none) hashes=22+2 location=embedded
8Platform identifier=14
9VersionPlatform=1
10VersionMin=853504
11VersionSDK=853504
12Hash type=sha256 size=32
13CandidateCDHash sha256=8cabf498b11a70dfc7d8a1d069c71dafd7e54b69
14CandidateCDHashFull sha256=8cabf498b11a70dfc7d8a1d069c71dafd7e54b691400e544af965b9d2f495b73
15Hash choices=sha256
16CMSDigest=8cabf498b11a70dfc7d8a1d069c71dafd7e54b691400e544af965b9d2f495b73
17CMSDigestType=2
18Executable Segment base=0
19Executable Segment limit=49152
20Executable Segment flags=0x1
21Page size=4096
22Launch Constraints:
23 None
24CDHash=8cabf498b11a70dfc7d8a1d069c71dafd7e54b69
25Signature size=4442
26Authority=Software Signing
27Authority=Apple Code Signing Certification Authority
28Authority=Apple Root CA
29Signed Time=28 Oct 2023 at 17:26:45
30Info.plist=not bound
31TeamIdentifier=not set
32Sealed Resources=none
33Internal requirements count=1 size=64
On the new machine:
0shasum -a 256 /usr/bin/patch
1214df67037191e570a95ddfe1427ebaad7c756f53348584d981759309d3dd489 /usr/bin/patch
2
3% codesign -dv --verbose=4 /usr/bin/patch
4Executable=/usr/bin/patch
5Identifier=com.apple.patch
6Format=Mach-O universal (x86_64 arm64e)
7CodeDirectory v=20400 size=680 flags=0x0(none) hashes=16+2 location=embedded
8Platform identifier=15
9VersionPlatform=1
10VersionMin=918528
11VersionSDK=918528
12Hash type=sha256 size=32
13CandidateCDHash sha256=9954ffa8ef205ae003a22e2635f467d496708e1e
14CandidateCDHashFull sha256=9954ffa8ef205ae003a22e2635f467d496708e1e48fae4425b758307eee58615
15Hash choices=sha256
16CMSDigest=9954ffa8ef205ae003a22e2635f467d496708e1e48fae4425b758307eee58615
17CMSDigestType=2
18Executable Segment base=0
19Executable Segment limit=49152
20Executable Segment flags=0x1
21Page size=4096
22CDHash=9954ffa8ef205ae003a22e2635f467d496708e1e
23Signature size=4442
24Authority=Software Signing
25Authority=Apple Code Signing Certification Authority
26Authority=Apple Root CA
27Signed Time=10 Feb 2024 at 09:02:40
28Info.plist=not bound
29TeamIdentifier=not set
30Sealed Resources=none
31Internal requirements count=1 size=64
Both are Intel.
Different code signature. Not sure how to check if the original is otherwise identical, or if they just got the version wrong. The SDK version is also different.
i would prefer not to require (nor suggest) any GNU tools on non-GNU operating systems, does this potentially affect any other deps besides bdb? Is it possible to figure out why this specific patch isn’t compatible with that apple patch (might indicate an ambiguity with the patch)?
ACK on the way this is worded, anyhow. But we might just sit this out until bdb is gone.
Edit: adding upstream label because it could be an upstream bug in the utility.
43@@ -44,6 +44,13 @@ Common `host-platform-triplet`s for cross compilation are:
44
45 The paths are automatically configured and no other options are needed unless targeting [Android](../doc/build-android.md).
46
47+### Install the required dependencies: macOS
48+
49+If building BerkeleyDB fails on macOS 13 or older, install the GNU version
50+of patch:
51+
52+ brew install gpatch
Yes I left that out, because the command will tell you to.
(also agree that we should at least wait until someone else runs into this - hopefully BDB will be gone before then)
(also agree that we should at least wait until someone else runs into this - hopefully BDB will be gone before then)
Ok, well then lets close this for now, given there’s not really anything to review or do here, other than wait indefinitely for someone else to report the same thing (prior to BDB removal / maintainence end). If that does happen, I’m sure we’ll remember this PR.