From e59058078431f820ecf249ce43c5230388f5507b Mon Sep 17 00:00:00 2001 From: Quentin Cozette Date: Mon, 8 Feb 2021 18:36:49 +0100 Subject: [PATCH] New overwrite in SALOME-master to build FD30 with debug warnings flags (LIBBATCH + CONFIGURATION) --- applications/SALOME-master.pyconf | 7 +++++++ .../CONFIGURATION-SALOME-DEBUG-WARNINGS.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 products/patches/CONFIGURATION-SALOME-DEBUG-WARNINGS.patch diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 783e90b..b57f0f9 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -201,6 +201,13 @@ __overwrite__ : 'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch'] } + { + # Build Fedora 30 with less permissive compilation flags (see spns #18962) + __condition__ : "VARS.dist in ['FD30']" + 'PRODUCTS.LIBBATCH.default.cmake_options' : "-DLIBBATCH_DEBUG_WARNINGS=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig" + 'PRODUCTS.CONFIGURATION.default.patches' : ['CONFIGURATION-SALOME-DEBUG-WARNINGS.patch'] + } + { __condition__ : "VARS.dist in ['FD32']" 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version diff --git a/products/patches/CONFIGURATION-SALOME-DEBUG-WARNINGS.patch b/products/patches/CONFIGURATION-SALOME-DEBUG-WARNINGS.patch new file mode 100644 index 0000000..e9affd7 --- /dev/null +++ b/products/patches/CONFIGURATION-SALOME-DEBUG-WARNINGS.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/SalomeSetupPlatform.cmake b/cmake/SalomeSetupPlatform.cmake +index 87cfdf1..b56af6f 100644 +--- a/cmake/SalomeSetupPlatform.cmake ++++ b/cmake/SalomeSetupPlatform.cmake +@@ -130,7 +130,7 @@ SET(CMAKE_CXX_STANDARD_REQUIRED ON) + + # Fight warnings + IF(NOT APPLE) +- OPTION(SALOME_DEBUG_WARNINGS "Report more warnings" OFF) ++ OPTION(SALOME_DEBUG_WARNINGS "Report more warnings" ON) + OPTION(SALOME_TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF) + # Report more warnings + MARK_AS_ADVANCED(SALOME_DEBUG_WARNINGS SALOME_TREAT_WARNINGS_AS_ERRORS) -- 2.39.2