rpms/vtk
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use %global to define __cc/__cxx

Browse Source
This commit is contained in:
Orion Poplawski 2022-01-19 19:46:24 -07:00
parent 23a9ec4569
commit 0af3c77a74
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vtk.spec
View File

@ -35,7 +35,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk Name: vtk
Version: 9.1.0 Version: 9.1.0
Release: 2%{?dist} Release: 3%{?dist}
# This is a variant BSD license, a cross between BSD and ZLIB. # This is a variant BSD license, a cross between BSD and ZLIB.
# For all intents, it has the same rights and restrictions as BSD. # For all intents, it has the same rights and restrictions as BSD.
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
@ -568,8 +568,8 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
%if %{with mpich} %if %{with mpich}
%global _vpath_builddir build-mpich %global _vpath_builddir build-mpich
%_mpich_load %_mpich_load
%define __cc mpicc %global __cc mpicc
%define __cxx mpic++ %global __cxx mpic++
%cmake %{cmake_gen} \ %cmake %{cmake_gen} \
%{vtk_cmake_options} \ %{vtk_cmake_options} \
-DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \
@ -585,8 +585,8 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
%if %{with openmpi} %if %{with openmpi}
%global _vpath_builddir build-openmpi %global _vpath_builddir build-openmpi
%_openmpi_load %_openmpi_load
%define __cc mpicc %global __cc mpicc
%define __cxx mpic++ %global __cxx mpic++
%cmake %{cmake_gen} \ %cmake %{cmake_gen} \
%{vtk_cmake_options} \ %{vtk_cmake_options} \
-DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \
@ -823,6 +823,9 @@ cat xorg.log
%changelog %changelog
* Thu Jan 20 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-3
- Use %%global to define __cc/__cxx
* Fri Jan 07 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-2 * Fri Jan 07 2022 Orion Poplawski <orion@nwra.com> - 9.1.0-2
- Make java-devel only be brought in by vtk-java-devel - Make java-devel only be brought in by vtk-java-devel