win32*.sh: improve lib handling

When building dependencies, we assume that libs will be placed in the
"lib" dir. Still, some distros might use "lib64" by default.

For this reason, we'll explicitly pass the expected lib path.

At the same time, we're dropping an unnecessary lib copy.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
This commit is contained in:
Lucian Petrut 2020-04-02 15:45:44 +00:00
parent 73e1747ba8
commit b8216c3bc1
2 changed files with 5 additions and 5 deletions

View File

@ -139,7 +139,7 @@ cmake -D CMAKE_PREFIX_PATH=$depsDirs \
-D WITH_MGR_DASHBOARD_FRONTEND=OFF -D WITH_SYSTEMD=OFF -D WITH_TESTS=OFF \
-D LZ4_INCLUDE_DIR=$lz4Include -D LZ4_LIBRARY=$lz4Lib \
-D Backtrace_INCLUDE_DIR="$backtraceDir/include" \
-D Backtrace_LIBRARY="$backtraceDir/lib/libbacktrace.dll.a" \
-D Backtrace_LIBRARY="$backtraceDir/lib/libbacktrace.a" \
-D ENABLE_GIT_VERSION=$ENABLE_GIT_VERSION \
-D ALLOCATOR="$ALLOCATOR" -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
-D WNBD_INCLUDE_DIRS="$wnbdSrcDir/include" \

View File

@ -112,7 +112,7 @@ fi
cd $sslSrcDir
mkdir -p $sslDir
CROSS_COMPILE="${MINGW_PREFIX}" ./Configure \
mingw64 shared --prefix=$sslDir
mingw64 shared --prefix=$sslDir --libdir="$sslDir/lib"
_make depend
_make
_make install
@ -125,7 +125,7 @@ fi
cd $curlSrcDir
./buildconf
./configure --prefix=$curlDir --with-ssl=$sslDir --with-zlib=$zlibDir \
--host=${MINGW_BASE}
--host=${MINGW_BASE} --libdir="$curlDir/lib"
_make
_make install
@ -275,10 +275,10 @@ fi
mkdir -p $backtraceSrcDir/build
cd $backtraceSrcDir/build
../configure --prefix=$backtraceDir --exec-prefix=$backtraceDir \
--host ${MINGW_BASE} --enable-host-shared
--host ${MINGW_BASE} --enable-host-shared \
--libdir="$backtraceDir/lib"
_make LDFLAGS="-no-undefined"
_make install
cp $backtraceDir/lib/libbacktrace.a $backtraceDir/lib/libbacktrace.dll.a
cd $depsSrcDir
if [[ ! -d $snappySrcDir ]]; then