From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Thu, 2 Apr 2020 15:45:44 +0000 (+0000)
Subject: win32*.sh: improve lib handling
X-Git-Tag: v16.1.0~138^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8216c3bc137699416fa3c0dd28667ae968adba0;p=ceph.git

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>
---

diff --git a/win32_build.sh b/win32_build.sh
index 55001fae4df..4a620f60a8a 100755
--- a/win32_build.sh
+++ b/win32_build.sh
@@ -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" \
diff --git a/win32_deps_build.sh b/win32_deps_build.sh
index af45ef98bbc..dbff416b1fd 100755
--- a/win32_deps_build.sh
+++ b/win32_deps_build.sh
@@ -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