[Openvpn-devel,v2] travis-ci: modify openssl build script to support openssl-1.1.0

Message ID 20180115080555.18202-1-chipitsine@gmail.com
State Accepted
Headers show
Series
  • [Openvpn-devel,v2] travis-ci: modify openssl build script to support openssl-1.1.0
Related show

Commit Message

Ilya Shipitsin Jan. 15, 2018, 8:05 a.m.
get rid of no-multilib, as it is not supported on openssl-1.1.0

Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
---
v2: get rid of no-multilib instead of including it conditionally,
thanks to Steffan Karger

 .travis/build-deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Steffan Karger Jan. 15, 2018, 10:02 a.m. | #1
Hi,

On 15-01-18 09:05, Ilya Shipitsin wrote:
> get rid of no-multilib, as it is not supported on openssl-1.1.0
> 
> Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
> ---
> v2: get rid of no-multilib instead of including it conditionally,
> thanks to Steffan Karger
> 
>  .travis/build-deps.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
> index bc538853..96a030cc 100755
> --- a/.travis/build-deps.sh
> +++ b/.travis/build-deps.sh
> @@ -111,7 +111,7 @@ build_openssl_mingw () {
>          fi
>  
>          ./Configure --cross-compile-prefix=${CHOST}- shared \
> -           ${TARGET} no-multilib no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
> +           ${TARGET} no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
>          make install
>      )
>  }
> 

Looks like the right thing to do to me.

Acked-by: Steffan Karger <steffan.karger@fox-it.com>

-Steffan

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Gert Doering Feb. 20, 2018, 1:07 p.m. | #2
Your patch has been applied to the master and release/2.4 branch.

commit 437be780996501becb18f0d34c256ab9c9fe27af (master)
commit b7aea67aa11b73417eeff595d13b0e2a7b9c925c (release/2.4)
Author: Ilya Shipitsin
Date:   Mon Jan 15 13:05:55 2018 +0500

     travis-ci: modify openssl build script to support openssl-1.1.0

     Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
     Acked-by: Steffan Karger <steffan.karger@fox-it.com>
     Message-Id: <20180115080555.18202-1-chipitsine@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg16229.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

Patch

diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
index bc538853..96a030cc 100755
--- a/.travis/build-deps.sh
+++ b/.travis/build-deps.sh
@@ -111,7 +111,7 @@  build_openssl_mingw () {
         fi
 
         ./Configure --cross-compile-prefix=${CHOST}- shared \
-           ${TARGET} no-multilib no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
+           ${TARGET} no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
         make install
     )
 }