]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
win32_deps_build: skip patching removed boost files
authorLucian Petrut <lpetrut@cloudbasesolutions.com>
Thu, 13 Jul 2023 10:48:14 +0000 (10:48 +0000)
committerLucian Petrut <lpetrut@cloudbasesolutions.com>
Tue, 18 Jul 2023 12:28:11 +0000 (12:28 +0000)
We're attempting to patch some Python files that have been removed
from recent Boost versions.

Now that the Boost version has been bumped, we'll need to address
this in order to unblock the Windows build.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
win32_deps_build.sh

index 7e6b1e0aa14057810104d222b98769c075a53a1a..980c58c5be9af424c904410c8a1f4193347f4dfa 100755 (executable)
@@ -157,10 +157,7 @@ echo "using gcc : mingw32 : ${MINGW_CXX} ;" > user-config.jam
 # Workaround for https://github.com/boostorg/thread/issues/156
 # Older versions of mingw provided a different pthread lib.
 sed -i 's/lib$(libname)GC2.a/lib$(libname).a/g' ./libs/thread/build/Jamfile.v2
-sed -i 's/mthreads/pthreads/g' ./tools/build/src/tools/gcc.py
 sed -i 's/mthreads/pthreads/g' ./tools/build/src/tools/gcc.jam
-
-sed -i 's/pthreads/mthreads/g' ./tools/build/src/tools/gcc.py
 sed -i 's/pthreads/mthreads/g' ./tools/build/src/tools/gcc.jam
 
 export PTW32_INCLUDE=${PTW32Include}