[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
Selva Nair Feb. 25, 2018, 3:26 a.m. | #3
Hi,

On Tue, Feb 20, 2018 at 8:07 AM, Gert Doering <gert@greenie.muc.de> wrote:
> 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
>

This added openssl 1.1.0 to the build matrix, but only for Linux, it seems.

Can we also have an openssl 1.1.0 based build for windows? Or
replacing the current ones with 1.1.0 will also do, I suppose.

Thanks,

Selva

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Ilya Shipitsin Feb. 25, 2018, 4:31 a.m. | #4
2018-02-25 8:26 GMT+05:00 Selva Nair <selva.nair@gmail.com>:

> Hi,
>
> On Tue, Feb 20, 2018 at 8:07 AM, Gert Doering <gert@greenie.muc.de> wrote:
> > 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
> >
>
> This added openssl 1.1.0 to the build matrix, but only for Linux, it seems.
>
> Can we also have an openssl 1.1.0 based build for windows? Or
> replacing the current ones with 1.1.0 will also do, I suppose.
>


after 2.4.5 we will replace


>
> Thanks,
>
> Selva
>
<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2018-02-25 8:26 GMT+05:00 Selva Nair <span dir="ltr">&lt;<a href="mailto:selva.nair@gmail.com" target="_blank">selva.nair@gmail.com</a>&gt;</span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<br>
On Tue, Feb 20, 2018 at 8:07 AM, Gert Doering &lt;<a href="mailto:gert@greenie.muc.de">gert@greenie.muc.de</a>&gt; wrote:<br>
&gt; Your patch has been applied to the master and release/2.4 branch.<br>
&gt;<br>
&gt; commit 437be780996501becb18f0d34c256a<wbr>b9c9fe27af (master)<br>
&gt; commit b7aea67aa11b73417eeff595d13b0e<wbr>2a7b9c925c (release/2.4)<br>
&gt; Author: Ilya Shipitsin<br>
&gt; Date:   Mon Jan 15 13:05:55 2018 +0500<br>
&gt;<br>
&gt;      travis-ci: modify openssl build script to support openssl-1.1.0<br>
&gt;<br>
<br>
This added openssl 1.1.0 to the build matrix, but only for Linux, it seems.<br>
<br>
Can we also have an openssl 1.1.0 based build for windows? Or<br>
replacing the current ones with 1.1.0 will also do, I suppose.<br></blockquote><div><br><br></div><div>after 2.4.5 we will replace<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Thanks,<br>
<br>
Selva<br>
</blockquote></div><br></div></div>
------------------------------------------------------------------------------
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
     )
 }