Merge pull request #14 from AnthonyEnr1quez/gcc_128

Check for 128 bit int support during build
MatthewVance · Nov 24, 2020 · b00bc37 · b00bc37
2 parents afb736e + f68aca2
commit b00bc37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/stubby/Dockerfile b/stubby/Dockerfile
@@ -28,11 +28,12 @@ RUN set -e -x && \
     gpg --batch --verify openssl.tar.gz.asc openssl.tar.gz && \
     tar xzf openssl.tar.gz && \
     cd "${VERSION_OPENSSL}" && \
+    /bin/sh -c 'if gcc -dM -E - </dev/null | grep -q __SIZEOF_INT128__; then export ECFLAG="enable-ec_nistp_64_gcc_128"; else export ECFLAG=""; fi' && \
     ./config \
         -Wl,-rpath=/opt/openssl/lib \
         --prefix=/opt/openssl \
         --openssldir=/opt/openssl \
-        enable-ec_nistp_64_gcc_128 \
+        $ECFLAG \
         -DOPENSSL_NO_HEARTBEATS \
         no-weak-ssl-ciphers \
         no-ssl2 \

diff --git a/unbound/Dockerfile b/unbound/Dockerfile
@@ -22,13 +22,14 @@ RUN set -e -x && \
     gpg --batch --verify openssl.tar.gz.asc openssl.tar.gz && \
     tar xzf openssl.tar.gz && \
     cd $VERSION_OPENSSL && \
+    /bin/sh -c 'if gcc -dM -E - </dev/null | grep -q __SIZEOF_INT128__; then export ECFLAG="enable-ec_nistp_64_gcc_128"; else export ECFLAG=""; fi' && \
     ./config \
       --prefix=/opt/openssl \
       --openssldir=/opt/openssl \
       no-weak-ssl-ciphers \
       no-ssl3 \
       no-shared \
-      enable-ec_nistp_64_gcc_128 \
+      $ECFLAG \
       -DOPENSSL_NO_HEARTBEATS \
       -fstack-protector-strong && \
     make depend && \