Skip to contentSkip to conversation

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

PATCH Superseded Ilya Shipitsin 2 participants 4 messages Jan 14, 2018 – Jan 15, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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

no-multilib is only supported on openssl-1.0.X, do not use it if OPENSSL_VERSION is 1.1.0

---
 .travis/build-deps.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
.travis/build-deps.sh +3 -2
index bc538853..1761932e 100755
@@ -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
     )
 }
Signature · 1 line
2.14.3
#1 lore raw

Hi,

Quoted 15 lines · Ilya Shipitsin

no-multilib is only supported on openssl-1.0.X, do not use it if OPENSSL_VERSION is 1.1.0

---
 .travis/build-deps.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
.travis/build-deps.sh +0 -0
index bc538853..1761932e 100755
@@ -110,8 +110,9 @@ build_openssl_mingw () {
             export TARGET=mingw64

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

Quoted 10 lines
.travis/build-deps.sh +3 -2
         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

#2 lore raw

2018-01-14 21:05 GMT+05:00 Steffan Karger <[email protected]...>:

Quoted 26 lines

Hi,

Quoted 13 lines · Ilya Shipitsin

no-multilib is only supported on openssl-1.0.X, do not use it if OPENSSL_VERSION is 1.1.0

---
 .travis/build-deps.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
.travis/build-deps.sh +0 -0
index bc538853..1761932e 100755

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

Quoted 5 lines
.travis/build-deps.sh +0 -2
@@ -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

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

Quoted 2 lines
.travis/build-deps.sh +2 -0
+        ./Configure --cross-compile-prefix=${CHOST}- shared ${TARGET} \
+           $([[ ${OPENSSL_VERSION} == "1.0."* ]] && echo "no-multilib")

\

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

Quoted 1 line
.travis/build-deps.sh +1 -0
+           no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}"
Quoted 9 lines

-static-libgcc

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

Quoted 4 lines
.travis/build-deps.sh +0 -0
         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

Quoted 12 lines

-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 [email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

#3 lore raw

I've built an installer without "no-multilib" and tested on both x86 and x64.

2018-01-14 23:33 GMT+05:00 Илья Шипицин <[email protected]...>:

Quoted 60 lines

2018-01-14 21:05 GMT+05:00 Steffan Karger <[email protected]...>:

Quoted 27 lines

Hi,

Quoted 13 lines · Ilya Shipitsin

no-multilib is only supported on openssl-1.0.X, do not use it if OPENSSL_VERSION is 1.1.0

---
 .travis/build-deps.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
.travis/build-deps.sh +0 -0
index bc538853..1761932e 100755

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

Quoted 5 lines
.travis/build-deps.sh +0 -2
@@ -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

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

Quoted 1 line
.travis/build-deps.sh +1 -0
+        ./Configure --cross-compile-prefix=${CHOST}- shared ${TARGET}

\

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

Quoted 1 line
.travis/build-deps.sh +1 -0
+           $([[ ${OPENSSL_VERSION} == "1.0."* ]] && echo

"no-multilib") \

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

Quoted 1 line
.travis/build-deps.sh +1 -0
+           no-capieng --prefix="${PREFIX}" --openssldir="${PREFIX}"
Quoted 9 lines

-static-libgcc

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

Quoted 4 lines
.travis/build-deps.sh +0 -0
         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

Quoted 12 lines

-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 [email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel