diff options
| author | Hans Nilsson <hans@erlang.org> | 2018-01-17 19:37:52 +0100 |
|---|---|---|
| committer | Hans Nilsson <hans@erlang.org> | 2018-01-25 18:23:29 +0100 |
| commit | 629dbe19a45d78aa1d9976af07491a1908c5ed8e (patch) | |
| tree | 062840aa889ebea100a1abac2d0755fd12b0310e | |
| parent | ed5a7c13060f40a289b190ba2e7fec147c523829 (diff) | |
| download | erlang-629dbe19a45d78aa1d9976af07491a1908c5ed8e.tar.gz | |
ssh: Enable building openssh 0.9.8[a-l]
| -rwxr-xr-x | lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image index 66f8358b8a..4ab2a8bddc 100755 --- a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image +++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image @@ -23,6 +23,16 @@ case "$1" in ;; esac +case $1$2 in + openssl0.9.8[a-l]) + CONFIG_FLAGS=no-asm + ;; + *) + CONFIG_FLAGS= + ;; +esac + + # This way of fetching the tar-file separate from the docker commands makes # http-proxy handling way easier. The wget command handles the $https_proxy # variable while the docker command must have /etc/docker/something changed @@ -42,10 +52,10 @@ cat - > TempDockerFile <<EOF WORKDIR ${FAM}-${VER} - RUN ./config --prefix=/buildroot/ssl + RUN ./config --prefix=/buildroot/ssl ${CONFIG_FLAGS} RUN make - RUN make install + RUN make install_sw RUN echo Built ${FAM}-${VER} EOF |