From 87210b79fa0b1b704760b098f7aa112e0fc97935 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 10 Dec 2021 15:38:51 +0100 Subject: [PATCH] windows: tbb debug mode patch forgotten --- applications/SALOME-master-windows.pyconf | 1 + .../patches/tbb-2019_U8_windows10_debug.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 products/patches/tbb-2019_U8_windows10_debug.patch diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index bc20b49..b4c0d7b 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -198,5 +198,6 @@ __overwrite__ : 'APPLICATION.products.sphinxintl' : '2.0.0-win-dbg' 'PRODUCTS.llvm.version_8_0_1_clang_win.build_source' : 'script' 'PRODUCTS.llvm.version_8_0_1_clang_win.compil_script' : 'llvm-8.0.1.bat' + 'PRODUCTS.tbb.version_2019_U8_win.patches' : ['tbb-2019_U8_windows10.patch', 'tbb-2019_U8_windows10_debug.patch'] } ] diff --git a/products/patches/tbb-2019_U8_windows10_debug.patch b/products/patches/tbb-2019_U8_windows10_debug.patch new file mode 100644 index 0000000..7b7c041 --- /dev/null +++ b/products/patches/tbb-2019_U8_windows10_debug.patch @@ -0,0 +1,15 @@ +diff -Naur tbb-2019_U8_ref/python/setup.py tbb-2019_U8_new/python/setup.py +--- tbb-2019_U8_ref/python/setup.py 2019-06-06 12:29:15.000000000 +0200 ++++ tbb-2019_U8_new/python/setup.py 2021-12-10 15:25:52.144064203 +0100 +@@ -53,9 +53,9 @@ + os.environ['DISTUTILS_USE_SDK'] = '1' # Enable environment settings in distutils + os.environ['MSSdk'] = '1' + print("Using compiler settings from environment") +- tbb_flag = ['/Qtbb'] if use_compiler_tbb else [] ++ tbb_flag = ['/Qtbb'] if use_compiler_tbb else ['-D_DEBUG'] + tbb_flag += ['/EHsc'] # for Python 2 +- compile_flags = ['/Qstd=c++11'] if intel_compiler else [] ++ compile_flags = ['/Qstd=c++11'] if intel_compiler else ['-D_DEBUG'] + else: + tbb_flag = ['-tbb'] if use_compiler_tbb else [] + compile_flags = ['-std=c++11', '-Wno-unused-variable'] -- 2.39.2