Rethink how to configure macports.

This will configure macports based on the BUILDARCH env variable.

This is why sleep is a good thing.

Author: ProjectSynchro

naev-macos/Dockerfile

@@ -72,7 +72,7 @@ WORKDIR /
 COPY --from=build /usr/lib/osxcross /usr/lib/osxcross 
 COPY --from=build /usr/local/bin/dmg /usr/bin
 # Copy Entrypoint
-COPY docker-entrypoint.sh /tmp
+COPY macports-configure.sh /usr/bin
 
 LABEL org.opencontainers.image.authors "Naev Dev Team"
 LABEL org.opencontainers.image.source "https://github.com/naev/naev-infrastructure"
@@ -111,5 +111,3 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettex
 # Set WORKDIR when you spin up the image.
     mkdir -p /tmp/naevBuild
 WORKDIR /tmp/naevBuild
-ENTRYPOINT ["/tmp/docker-entrypoint.sh"]
-CMD ["bash"]

naev-macos/docker-entrypoint.sh naev-macos/macports-configure.shnaev-macos/docker-entrypoint.sh renamed to naev-macos/macports-configure.sh

@@ -8,16 +8,17 @@
 if [[ "$BUILDARCH" == "aarch64" ]] then
     export HOST="aarch64-apple-darwin23"
     export MACOSX_DEPLOYMENT_TARGET="$AARCH64_DEPLOYMENT_TARGET"
-    mv /usr/lib/osxcross/macports.aarch64 /usr/lib/osxcross/macports
+    rm -f /usr/lib/osxcross/macports
+    ln -s /usr/lib/osxcross/macports.aarch64 /usr/lib/osxcross/macports
 elif [[ "$BUILDARCH" == "x86_64" ]] then
     export HOST="x86_64-apple-darwin23"
     export MACOSX_DEPLOYMENT_TARGET="$X86_64_DEPLOYMENT_TARGET"
-    mv /usr/lib/osxcross/macports.x86_64 /usr/lib/osxcross/macports
+    rm -f /usr/lib/osxcross/macports
+    ln -s /usr/lib/osxcross/macports.x86_64 /usr/lib/osxcross/macports
 # Fallback
 else
     export HOST="x86_64-apple-darwin23"
     export MACOSX_DEPLOYMENT_TARGET="$X86_64_DEPLOYMENT_TARGET"
-    mv /usr/lib/osxcross/macports.x86_64 /usr/lib/osxcross/macports
+    rm -f /usr/lib/osxcross/macports
+    ln -s /usr/lib/osxcross/macports.x86_64 /usr/lib/osxcross/macports
 fi
-
-exec "$@"