From: Andy Polyakov <appro@openssl.org>
Date: Sun, 6 May 2018 16:36:09 +0000 (+0200)
Subject: .travis.yml: temporarily mask gcc-5 ubsan build.
X-Git-Tag: OpenSSL_1_1_1-pre7~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a602decedb8d91385992d8e50cd1bb4bde111c33;p=thirdparty%2Fopenssl.git

.travis.yml: temporarily mask gcc-5 ubsan build.

Linking fails with "unrecognized option '--push-state--no-as-needed'",
which is beyond our control.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6185)
---

diff --git a/.travis.yml b/.travis.yml
index 507d13896c0..d5147f181c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,16 +83,16 @@ matrix:
         - os: linux
           compiler: clang
           env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -D__NO_STRING_INLINES -Wno-unused-command-line-argument"
-        - os: linux
-          addons:
-              apt:
-                  packages:
-                      - gcc-5
-                      - g++-5
-                  sources:
-                      - ubuntu-toolchain-r-test
-          compiler: gcc-5
-          env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0
+        #- os: linux
+        #  addons:
+        #      apt:
+        #          packages:
+        #              - gcc-5
+        #              - g++-5
+        #          sources:
+        #              - ubuntu-toolchain-r-test
+        #  compiler: gcc-5
+        #  env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" OPENSSL_TEST_RAND_ORDER=0
         - os: linux
           addons:
               apt: