33 lines
1.9 KiB
Diff
33 lines
1.9 KiB
Diff
diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
|
|
--- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 2019-01-30 10:15:13.000000000 -0700
|
|
+++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c 2020-05-08 21:38:46.401363001 -0600
|
|
@@ -614,5 +614,5 @@ int ex_create_par_int(const char *path,
|
|
* Prevent warning in some versions of ranlib(1) because the object
|
|
* file has no symbols.
|
|
*/
|
|
-const char exodus_unused_symbol_dummy_1;
|
|
+const char exodus_unused_symbol_dummy_ex_create_par;
|
|
#endif
|
|
diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
|
|
--- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 2019-01-30 10:15:13.000000000 -0700
|
|
+++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c 2020-05-08 21:38:46.402363007 -0600
|
|
@@ -474,5 +474,5 @@ int ex_open_par_int(const char *path, in
|
|
* Prevent warning in some versions of ranlib(1) because the object
|
|
* file has no symbols.
|
|
*/
|
|
-const char exodus_unused_symbol_dummy_1;
|
|
+const char exodus_unused_symbol_dummy_ex_open_par;
|
|
#endif
|
|
diff -up VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake
|
|
--- VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 2019-01-30 10:15:13.000000000 -0700
|
|
+++ VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake 2020-05-26 21:07:24.625840251 -0600
|
|
@@ -174,7 +174,7 @@ macro(_vtk_test_compiler_hidden_visibili
|
|
execute_process(COMMAND ${CMAKE_C_COMPILER} --version
|
|
OUTPUT_VARIABLE _gcc_version_info
|
|
ERROR_VARIABLE _gcc_version_info)
|
|
- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
|
|
+ string(REGEX MATCH "[1-9][0-9]*\\.[0-9]+\\.[0-9]+"
|
|
_gcc_version "${_gcc_version_info}")
|
|
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
|
|
# patch level, handle this here:
|