Skip to contentSkip to conversation

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

PATCH In review Ilya Shipitsin 4 participants 5 messages Jan 15, 2018 – Feb 25, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 travis-ci: modify openssl build script to support openssl-1.1.0

get rid of no-multilib, as it is not supported on openssl-1.1.0

---
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(-)
.travis/build-deps.sh +1 -1
index bc538853..96a030cc 100755
@@ -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
     )
 }
Signature · 1 line
2.14.3
Acked-by on v2 1/1
#1 lore raw

Hi,

Quoted 16 lines · Ilya Shipitsin

get rid of no-multilib, as it is not supported on openssl-1.1.0

---
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(-)
.travis/build-deps.sh +0 -0
index bc538853..96a030cc 100755

.travis/build-deps.sh build_openssl_mingw () { · line 117

Quoted 8 lines
.travis/build-deps.sh +1 -1
@@ -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.

-Steffan

#2 lore raw
In reply to Ilya Shipitsin

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 <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg16229.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#3 lore raw

Hi,

Quoted 9 lines · Gert Doering

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

#4 lore raw

2018-02-25 8:26 GMT+05:00 Selva Nair <[email protected]...>:

Quoted 10 lines

Hi,

Quoted 7 lines · Gert Doering

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
Quoted 8 lines
Quoted 2 lines

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

Quoted 5 lines

Thanks,

Selva