]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #48148 from ktdreyer/win-remove-curl
authorLucian Petrut <lpetrut@cloudbasesolutions.com>
Fri, 23 Sep 2022 07:43:44 +0000 (10:43 +0300)
committerGitHub <noreply@github.com>
Fri, 23 Sep 2022 07:43:44 +0000 (10:43 +0300)
win32: remove libcurl

1  2 
CMakeLists.txt
win32_deps_build.sh

diff --cc CMakeLists.txt
Simple merge
index e97bd8c5bf295abb7551a47fabae69e8fba0c69b,ddb281acff64c7465a5d67571b8d512ff08d5a56..bf0a3aa060c3df10c17d2530c2d97bf1db925436
@@@ -126,22 -122,8 +122,8 @@@ CROSS_COMPILE="${MINGW_PREFIX}" ./Confi
      mingw64 shared --prefix=$sslDir --libdir="$sslDir/lib"
  _make depend
  _make
 -_make install
 +_make install_sw
  
- echo "Building libcurl."
- cd $depsSrcDir
- if [[ ! -d $curlSrcDir ]]; then
-     git clone --branch $curlTag --depth 1 https://github.com/curl/curl
-     cd $curlSrcDir
- fi
- cd $curlSrcDir
- ./buildconf
- ./configure --prefix=$curlDir --with-ssl=$sslDir --with-zlib=$zlibDir \
-             --host=${MINGW_BASE} --libdir="$curlDir/lib"
- _make
- _make install
  echo "Building boost."
  cd $depsSrcDir
  if [[ ! -d $boostSrcDir ]]; then