From 8dfd62775fc672cfa1385945d992a61a2f336686 Mon Sep 17 00:00:00 2001
From: Fred Wright <fw@fwright.net>
Date: Wed, 6 Nov 2024 19:30:59 -0800
Subject: [PATCH] Fix build on 10.4 x86_64
The special treatment for 10.4 in splitandfilterandmergemultiarch was
not being applied appropriately to x86_64, causing a build failure
for fdopendir.
Fixing this bug prior to fixing the realpath() wrapper resulted in
successfully building code that didn't work correctly, though the
realpath() bug wasn't limited to this one configuration.
Note that at the time of this writing, when this case is built as a
port, the architecture is coerced to i386. Until that is fixed, this
fix won't affect the actual port.
TESTED:
With the realpath() fix, builds successfully on all platforms,
including 10.4 x86_64.
---
Makefile | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index fcb1187..d26e79e 100644
--- a/Makefile
+++ b/Makefile
@@ -242,10 +242,7 @@ define splitandfilterandmergemultiarch
$$(: 'On the contrary, the i386 architecture has only $$UNIX2003-compat functions for the $$INODE64 feature set.') && \
$$(: '10.4 is so old that it does not even have the $$INODE64 feature.') && \
case "$${arch}" in \
- ('x86_64') \
- $${ld} -r "$${output}.inode32.$${arch}" "$${output}.inode64.$${arch}" -o "$${output}.$${arch}"; \
- ;; \
- ('ppc64') \
+ ('x86_64'|'ppc64') \
if [ '9' -gt "$${platform}" ]; then \
$${ld} -r "$${output}.inode32.$${arch}" -o "$${output}.$${arch}"; \
else \
--
GitLab