diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
tree | cf61513204d97974179580065e85df5c8009087c /sci-libs/opencascade/files | |
parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) |
gentoo resync : 03.03.2021
Diffstat (limited to 'sci-libs/opencascade/files')
3 files changed, 102 insertions, 0 deletions
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch new file mode 100644 index 000000000000..0d4015cabd78 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.4.0-Gentoo-specific-avoid-pre-stripping-files.patch @@ -0,0 +1,30 @@ +From 2ddba09ea491ae5d18b074a2d1126d44c0a2b1f6 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Tue, 9 Feb 2021 22:26:14 +0100 +Subject: [PATCH] [Gentoo-specific] avoid pre-stripping files + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + adm/cmake/occt_defs_flags.cmake | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake +index 5484c675..4e513ab5 100644 +--- a/adm/cmake/occt_defs_flags.cmake ++++ b/adm/cmake/occt_defs_flags.cmake +@@ -137,12 +137,6 @@ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX) + set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}") + endif() + +-# Optimize size of binaries +-if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW) +- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") +- set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s") +-endif() +- + if (BUILD_RELEASE_DISABLE_EXCEPTIONS) + set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception") + set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception") +-- +2.30.0 + diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch new file mode 100644 index 000000000000..7e2bb1d7b2ab --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.4.0-fix-flow-control-nesting.patch @@ -0,0 +1,31 @@ +From e69c42386239bcc08143607df12b8bb3f1ff14ba Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Wed, 24 Feb 2021 20:06:02 +0100 +Subject: [PATCH] adm/cmake/vtk.cmake: fix flow control nesting + +Fix an unbalanced nesting of flow control statements +for >=cmake-3.20.0 + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + adm/cmake/vtk.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake +index c5692fd6..00b7ff4a 100644 +--- a/adm/cmake/vtk.cmake ++++ b/adm/cmake/vtk.cmake +@@ -156,8 +156,8 @@ if (VTK_FOUND) + endif() + endif() + endif() +- endif() +- endforeach() ++ endforeach() ++ endif() + endif() + + if (3RDPARTY_VTK_INCLUDE_DIRS) +-- +2.30.1 + diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch new file mode 100644 index 000000000000..aacb642019ff --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch @@ -0,0 +1,41 @@ +From cefaa5bddedcb90a06d6ef8f0837a11619e5d87e Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Tue, 9 Feb 2021 20:58:43 +0100 +Subject: [PATCH] fix issue with cmake path variables + +Thanks to Fabio Rossi for reporting the issue. +Upstream bug: https://tracker.dev.opencascade.org/view.php?id=32035 + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + adm/templates/OpenCASCADEConfig.cmake.in | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in +index 4937103b..db99a8d1 100644 +--- a/adm/templates/OpenCASCADEConfig.cmake.in ++++ b/adm/templates/OpenCASCADEConfig.cmake.in +@@ -16,19 +16,7 @@ set (OpenCASCADE_MINOR_VERSION "@OCC_VERSION_MINOR@") + set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@") + set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@") + +-# Compute the installation prefix from this OpenCASCADEConfig.cmake file +-# location, by going up one level + one level if "cmake" + one level if "lib". +-# This is made to support different locations of CMake files: +-# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-<version> +-# - in Windows style: $INSTALL_DIR/cmake +-get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +-get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) +-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") +- get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) +-endif() +-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$") +- get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) +-endif() ++set (OpenCASCADE_INSTALL_PREFIX "$ENV{CASROOT}") + + # Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data + set (OpenCASCADE_BINARY_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@") +-- +2.30.0 + |