References: <20180114140627.25331-1-chipitsine@...277...> From: Steffan Karger Message-ID: Date: Sun, 14 Jan 2018 17:05:39 +0100 MIME-Version: 1.0 In-Reply-To: <20180114140627.25331-1-chipitsine@...277...> Content-Language: en-US Subject: Re: [Openvpn-devel] [PATCH] travis-ci: modify openssl build script to support openssl-1.1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit To: openvpn-devel@lists.sourceforge.net 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 > --- > .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