From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Thu, 13 Jul 2023 10:48:14 +0000 (+0000)
Subject: win32_deps_build: skip patching removed boost files
X-Git-Tag: v19.0.0~843^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d92c2d74e5975d0a037f316f21ac2f1454d092b;p=ceph.git

win32_deps_build: skip patching removed boost files

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

diff --git a/win32_deps_build.sh b/win32_deps_build.sh
index 7e6b1e0aa140..980c58c5be9a 100755
--- a/win32_deps_build.sh
+++ b/win32_deps_build.sh
@@ -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}