Skip to content
/ gentoo Public
forked from gentoo/gentoo

Commit

Permalink
sci-visualization/paraview: fix compilation with CMake 3.31 onwards
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/947535
Signed-off-by: Matthias Maier <[email protected]>
  • Loading branch information
tamiko committed Jan 7, 2025
1 parent 10ed79e commit d452971
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
From https://gitlab.kitware.com/paraview/paraview/-/commit/f1543ffcb1db1832d00c0fe8d183c1b63af96827?merge_request_iid=7135

diff --git a/CMake/ParaViewCompilerExtraFlags.cmake b/CMake/ParaViewCompilerExtraFlags.cmake
index 4feb06da0c481c382605effeee20cc4a00f59cfe..4c1b87876f0b444e751dd3a6ee66d485ae09c32b 100644
--- a/CMake/ParaViewCompilerExtraFlags.cmake
+++ b/CMake/ParaViewCompilerExtraFlags.cmake
@@ -37,7 +37,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(paraviewbuild
PROPERTIES
INTERFACE_LINK_OPTIONS
- "LINKER:SHELL:${PARAVIEW_EXTRA_SHARED_LINKER_FLAGS} -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+ "LINKER:SHELL:${PARAVIEW_EXTRA_SHARED_LINKER_FLAGS} -lc")
endif()
endif()

3 changes: 2 additions & 1 deletion sci-visualization/paraview/paraview-5.13.0.ebuild
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8
Expand Down Expand Up @@ -100,6 +100,7 @@ BDEPEND="

PATCHES=(
"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
"${FILESDIR}"/${P}-cmake-3.31-compat.patch
)

# false positive when checking for available HDF5 interface, bug #904731
Expand Down
1 change: 1 addition & 0 deletions sci-visualization/paraview/paraview-5.13.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ BDEPEND="

PATCHES=(
"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
"${FILESDIR}"/${PN}-5.13.0-cmake-3.31-compat.patch
)

# false positive when checking for available HDF5 interface, bug #904731
Expand Down

0 comments on commit d452971

Please sign in to comment.