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

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

Commit Message

Илья Шипицин Jan. 14, 2018, 2:06 p.m.
no-multilib is only supported on openssl-1.0.X, do not use it
if OPENSSL_VERSION is 1.1.0

Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
---
 .travis/build-deps.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Steffan Karger Jan. 14, 2018, 4:05 p.m. | #1
Hi,

On 14-01-18 15:06, Ilya Shipitsin wrote:
> no-multilib is only supported on openssl-1.0.X, do not use it
> if OPENSSL_VERSION is 1.1.0
> 
> Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
> ---
>  .travis/build-deps.sh | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
> index bc538853..1761932e 100755
> --- a/.travis/build-deps.sh
> +++ b/.travis/build-deps.sh
> @@ -110,8 +110,9 @@ build_openssl_mingw () {
>              export TARGET=mingw64
>          fi
>  
> -        ./Configure --cross-compile-prefix=${CHOST}- shared \
> -           ${TARGET} no-multilib no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
> +        ./Configure --cross-compile-prefix=${CHOST}- shared ${TARGET} \
> +           $([[ ${OPENSSL_VERSION} == "1.0."* ]] && echo "no-multilib") \
> +           no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
>          make install
>      )
>  }
> 

Do we need no-multilib for 1.0.x builds?  If not, I'd prefer to just get
rid of it.

-Steffan

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Илья Шипицин Jan. 14, 2018, 6:33 p.m. | #2
2018-01-14 21:05 GMT+05:00 Steffan Karger <steffan@karger.me>:

> Hi,
>
> On 14-01-18 15:06, Ilya Shipitsin wrote:
> > no-multilib is only supported on openssl-1.0.X, do not use it
> > if OPENSSL_VERSION is 1.1.0
> >
> > Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
> > ---
> >  .travis/build-deps.sh | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
> > index bc538853..1761932e 100755
> > --- a/.travis/build-deps.sh
> > +++ b/.travis/build-deps.sh
> > @@ -110,8 +110,9 @@ build_openssl_mingw () {
> >              export TARGET=mingw64
> >          fi
> >
> > -        ./Configure --cross-compile-prefix=${CHOST}- shared \
> > -           ${TARGET} no-multilib no-capieng --prefix="${PREFIX}"
> --openssldir="${PREFIX}" -static-libgcc
> > +        ./Configure --cross-compile-prefix=${CHOST}- shared ${TARGET} \
> > +           $([[ ${OPENSSL_VERSION} == "1.0."* ]] && echo "no-multilib")
> \
> > +           no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}"
> -static-libgcc
> >          make install
> >      )
> >  }
> >
>
> Do we need no-multilib for 1.0.x builds?  If not, I'd prefer to just get
> rid of it.
>

it came from windows installer.
let me build windows installer without no-multilib and test



>
> -Steffan
>
> ------------------------------------------------------------
> ------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Openvpn-devel mailing list
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>
<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2018-01-14 21:05 GMT+05:00 Steffan Karger <span dir="ltr">&lt;<a href="mailto:steffan@karger.me" target="_blank">steffan@karger.me</a>&gt;</span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<span class=""><br>
On 14-01-18 15:06, Ilya Shipitsin wrote:<br>
&gt; no-multilib is only supported on openssl-1.0.X, do not use it<br>
&gt; if OPENSSL_VERSION is 1.1.0<br>
&gt;<br>
&gt; Signed-off-by: Ilya Shipitsin &lt;<a href="mailto:chipitsine@gmail.com">chipitsine@gmail.com</a>&gt;<br>
&gt; ---<br>
&gt;  .travis/build-deps.sh | 5 +++--<br>
&gt;  1 file changed, 3 insertions(+), 2 deletions(-)<br>
&gt;<br>
&gt; diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh<br>
&gt; index bc538853..1761932e 100755<br>
&gt; --- a/.travis/build-deps.sh<br>
&gt; +++ b/.travis/build-deps.sh<br>
&gt; @@ -110,8 +110,9 @@ build_openssl_mingw () {<br>
&gt;              export TARGET=mingw64<br>
&gt;          fi<br>
&gt;<br>
&gt; -        ./Configure --cross-compile-prefix=${<wbr>CHOST}- shared \<br>
&gt; -           ${TARGET} no-multilib no-capieng --prefix=&quot;${PREFIX}&quot; --openssldir=&quot;${PREFIX}&quot; -static-libgcc<br>
&gt; +        ./Configure --cross-compile-prefix=${<wbr>CHOST}- shared ${TARGET} \<br>
&gt; +           $([[ ${OPENSSL_VERSION} == &quot;1.0.&quot;* ]] &amp;&amp; echo &quot;no-multilib&quot;) \<br>
&gt; +           no-capieng --prefix=&quot;${PREFIX}&quot; --openssldir=&quot;${PREFIX}&quot; -static-libgcc<br>
&gt;          make install<br>
&gt;      )<br>
&gt;  }<br>
&gt;<br>
<br>
</span>Do we need no-multilib for 1.0.x builds?  If not, I&#39;d prefer to just get<br>
rid of it.<br></blockquote><div><br></div><div>it came from windows installer.</div><div>let me build windows installer without no-multilib and test<br></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
-Steffan<br>
<br>
------------------------------<wbr>------------------------------<wbr>------------------<br>
Check out the vibrant tech community on one of the world&#39;s most<br>
engaging tech sites, Slashdot.org! <a href="http://sdm.link/slashdot" rel="noreferrer" target="_blank">http://sdm.link/slashdot</a><br>
______________________________<wbr>_________________<br>
Openvpn-devel mailing list<br>
<a href="mailto:Openvpn-devel@lists.sourceforge.net">Openvpn-devel@lists.<wbr>sourceforge.net</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/openvpn-devel" rel="noreferrer" target="_blank">https://lists.sourceforge.net/<wbr>lists/listinfo/openvpn-devel</a><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
Илья Шипицин Jan. 15, 2018, 8:07 a.m. | #3
I've built an installer without "no-multilib" and tested on both x86 and
x64.

2018-01-14 23:33 GMT+05:00 Илья Шипицин <chipitsine@gmail.com>:

>
>
> 2018-01-14 21:05 GMT+05:00 Steffan Karger <steffan@karger.me>:
>
>> Hi,
>>
>> On 14-01-18 15:06, Ilya Shipitsin wrote:
>> > no-multilib is only supported on openssl-1.0.X, do not use it
>> > if OPENSSL_VERSION is 1.1.0
>> >
>> > Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
>> > ---
>> >  .travis/build-deps.sh | 5 +++--
>> >  1 file changed, 3 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
>> > index bc538853..1761932e 100755
>> > --- a/.travis/build-deps.sh
>> > +++ b/.travis/build-deps.sh
>> > @@ -110,8 +110,9 @@ build_openssl_mingw () {
>> >              export TARGET=mingw64
>> >          fi
>> >
>> > -        ./Configure --cross-compile-prefix=${CHOST}- shared \
>> > -           ${TARGET} no-multilib no-capieng --prefix="${PREFIX}"
>> --openssldir="${PREFIX}" -static-libgcc
>> > +        ./Configure --cross-compile-prefix=${CHOST}- shared ${TARGET}
>> \
>> > +           $([[ ${OPENSSL_VERSION} == "1.0."* ]] && echo
>> "no-multilib") \
>> > +           no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}"
>> -static-libgcc
>> >          make install
>> >      )
>> >  }
>> >
>>
>> Do we need no-multilib for 1.0.x builds?  If not, I'd prefer to just get
>> rid of it.
>>
>
> it came from windows installer.
> let me build windows installer without no-multilib and test
>
>
>
>>
>> -Steffan
>>
>> ------------------------------------------------------------
>> ------------------
>> Check out the vibrant tech community on one of the world's most
>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>> _______________________________________________
>> Openvpn-devel mailing list
>> Openvpn-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>>
>
>
<div dir="ltr">I&#39;ve built an installer without &quot;no-multilib&quot; and tested on both x86 and x64.<br></div><div class="gmail_extra"><br><div class="gmail_quote">2018-01-14 23:33 GMT+05:00 Илья Шипицин <span dir="ltr">&lt;<a href="mailto:chipitsine@gmail.com" target="_blank">chipitsine@gmail.com</a>&gt;</span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><div><div class="h5">2018-01-14 21:05 GMT+05:00 Steffan Karger <span dir="ltr">&lt;<a href="mailto:steffan@karger.me" target="_blank">steffan@karger.me</a>&gt;</span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<span><br>
On 14-01-18 15:06, Ilya Shipitsin wrote:<br>
&gt; no-multilib is only supported on openssl-1.0.X, do not use it<br>
&gt; if OPENSSL_VERSION is 1.1.0<br>
&gt;<br>
&gt; Signed-off-by: Ilya Shipitsin &lt;<a href="mailto:chipitsine@gmail.com" target="_blank">chipitsine@gmail.com</a>&gt;<br>
&gt; ---<br>
&gt;  .travis/build-deps.sh | 5 +++--<br>
&gt;  1 file changed, 3 insertions(+), 2 deletions(-)<br>
&gt;<br>
&gt; diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh<br>
&gt; index bc538853..1761932e 100755<br>
&gt; --- a/.travis/build-deps.sh<br>
&gt; +++ b/.travis/build-deps.sh<br>
&gt; @@ -110,8 +110,9 @@ build_openssl_mingw () {<br>
&gt;              export TARGET=mingw64<br>
&gt;          fi<br>
&gt;<br>
&gt; -        ./Configure --cross-compile-prefix=${CHOST<wbr>}- shared \<br>
&gt; -           ${TARGET} no-multilib no-capieng --prefix=&quot;${PREFIX}&quot; --openssldir=&quot;${PREFIX}&quot; -static-libgcc<br>
&gt; +        ./Configure --cross-compile-prefix=${CHOST<wbr>}- shared ${TARGET} \<br>
&gt; +           $([[ ${OPENSSL_VERSION} == &quot;1.0.&quot;* ]] &amp;&amp; echo &quot;no-multilib&quot;) \<br>
&gt; +           no-capieng --prefix=&quot;${PREFIX}&quot; --openssldir=&quot;${PREFIX}&quot; -static-libgcc<br>
&gt;          make install<br>
&gt;      )<br>
&gt;  }<br>
&gt;<br>
<br>
</span>Do we need no-multilib for 1.0.x builds?  If not, I&#39;d prefer to just get<br>
rid of it.<br></blockquote><div><br></div></div></div><div>it came from windows installer.</div><div>let me build windows installer without no-multilib and test<br></div><span class=""><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
-Steffan<br>
<br>
------------------------------<wbr>------------------------------<wbr>------------------<br>
Check out the vibrant tech community on one of the world&#39;s most<br>
engaging tech sites, Slashdot.org! <a href="http://sdm.link/slashdot" rel="noreferrer" target="_blank">http://sdm.link/slashdot</a><br>
______________________________<wbr>_________________<br>
Openvpn-devel mailing list<br>
<a href="mailto:Openvpn-devel@lists.sourceforge.net" target="_blank">Openvpn-devel@lists.sourceforg<wbr>e.net</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/openvpn-devel" rel="noreferrer" target="_blank">https://lists.sourceforge.net/<wbr>lists/listinfo/openvpn-devel</a><br>
</blockquote></span></div><br></div></div>
</blockquote></div><br></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..1761932e 100755
--- a/.travis/build-deps.sh
+++ b/.travis/build-deps.sh
@@ -110,8 +110,9 @@  build_openssl_mingw () {
             export TARGET=mingw64
         fi
 
-        ./Configure --cross-compile-prefix=${CHOST}- shared \
-           ${TARGET} no-multilib no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
+        ./Configure --cross-compile-prefix=${CHOST}- shared ${TARGET} \
+           $([[ ${OPENSSL_VERSION} == "1.0."* ]] && echo "no-multilib") \
+           no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}" -static-libgcc
         make install
     )
 }