Fix static linking of libatomic with openssl.

Without this flag, the Rust binary would still require the libatomic
dynamic library. This issue was caused by the upgrade to openssl
v3.1.2.

Author: brocaar

.cargo/config.toml

@@ -25,7 +25,6 @@
     "-C", "link-arg=-s",
     "-C", "link-arg=-lc",
     "-C", "link-arg=-lgcc",
-    "-C", "link-arg=-latomic",
     "-L", "native=/usr/local/mips-linux-muslsf-target/lib",
     "-l", "static=stdc++",
   ]
@@ -37,7 +36,6 @@
     "-C", "link-arg=-s",
     "-C", "link-arg=-lc",
     "-C", "link-arg=-lgcc",
-    "-C", "link-arg=-latomic",
     "-L", "native=/usr/local/mipsel-linux-muslsf-target/lib",
     "-l", "static=stdc++",
   ]
@@ -51,7 +49,6 @@
     "-C", "link-arg=-s",
     "-C", "link-arg=-lc",
     "-C", "link-arg=-lgcc",
-    "-C", "link-arg=-latomic",
     "-L", "native=/usr/local/arm-linux-musleabi-target/lib",
     "-l", "static=stdc++",
   ]

cross/Dockerfile.armv5te-unknown-linux-musleabi

@@ -13,7 +13,7 @@ RUN echo "Building OpenSSL" && \
     cd /tmp && \
     curl -fLO "https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" && \
     tar xvzf "openssl-$OPENSSL_VERSION.tar.gz" && cd "openssl-$OPENSSL_VERSION" && \
-    env CC=$MUSL_PREFIX-gcc ./Configure no-shared no-zlib -fPIC -latomic --prefix=/usr/local/$MUSL_PREFIX-target -DOPENSSL_NO_SECURE_MEMORY $OPENSSL_TARGET && \
+    env CC=$MUSL_PREFIX-gcc ./Configure no-shared no-zlib -fPIC --static -static --prefix=/usr/local/$MUSL_PREFIX-target -DOPENSSL_NO_SECURE_MEMORY $OPENSSL_TARGET && \
     env C_INCLUDE_PATH=/usr/local/$MUSL_PREFIX/include/ make depend && \
     env C_INCLUDE_PATH=/usr/local/$MUSL_PREFIX/include/ make && \
     make install_sw && \

cross/Dockerfile.mips-unknown-linux-musl

@@ -13,7 +13,7 @@ RUN echo "Building OpenSSL" && \
     cd /tmp && \
     curl -fLO "https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" && \
     tar xvzf "openssl-$OPENSSL_VERSION.tar.gz" && cd "openssl-$OPENSSL_VERSION" && \
-    env CC=$MUSL_PREFIX-gcc ./Configure no-shared no-zlib -fPIC --prefix=/usr/local/$MUSL_PREFIX-target -DOPENSSL_NO_SECURE_MEMORY $OPENSSL_TARGET && \
+    env CC=$MUSL_PREFIX-gcc ./Configure no-shared no-zlib -fPIC --static -static --prefix=/usr/local/$MUSL_PREFIX-target -DOPENSSL_NO_SECURE_MEMORY $OPENSSL_TARGET && \
     env C_INCLUDE_PATH=/usr/local/$MUSL_PREFIX/include/ make depend && \
     env C_INCLUDE_PATH=/usr/local/$MUSL_PREFIX/include/ make && \
     make install_sw && \

cross/Dockerfile.mipsel-unknown-linux-musl

@@ -13,7 +13,7 @@ RUN echo "Building OpenSSL" && \
     cd /tmp && \
     curl -fLO "https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" && \
     tar xvzf "openssl-$OPENSSL_VERSION.tar.gz" && cd "openssl-$OPENSSL_VERSION" && \
-    env CC=$MUSL_PREFIX-gcc ./Configure no-shared no-zlib -fPIC --prefix=/usr/local/$MUSL_PREFIX-target -DOPENSSL_NO_SECURE_MEMORY $OPENSSL_TARGET && \
+    env CC=$MUSL_PREFIX-gcc ./Configure no-shared no-zlib -fPIC --static -static --prefix=/usr/local/$MUSL_PREFIX-target -DOPENSSL_NO_SECURE_MEMORY $OPENSSL_TARGET && \
     env C_INCLUDE_PATH=/usr/local/$MUSL_PREFIX/include/ make depend && \
     env C_INCLUDE_PATH=/usr/local/$MUSL_PREFIX/include/ make && \
     make install_sw && \