Explicitly use python2

Build with libtirpc
This commit is contained in:
Orion Poplawski 2018-02-21 09:15:32 -07:00
parent 0b959cb930
commit b2e0b6eb2b

View File

@ -126,6 +126,7 @@ popd
-DUDUNITS_INCLUDE_DIR=%{_includedir}/udunits2 \\\ -DUDUNITS_INCLUDE_DIR=%{_includedir}/udunits2 \\\
-DGRIB=ON \\\ -DGRIB=ON \\\
-DOPENMP=ON \\\ -DOPENMP=ON \\\
-DPYTHON_EXECUTABLE=%{_bindir}/python2 \\\
%{?cmake_qhull} \\\ %{?cmake_qhull} \\\
%{nil} %{nil}
# TODO - build an mpi version # TODO - build an mpi version
@ -133,9 +134,8 @@ popd
# --with-mpich=%{_libdir}/mpich2 \ # --with-mpich=%{_libdir}/mpich2 \
%build %build
# Build convenience .a libraries with -fPIC export CFLAGS="%{optflags} -I%{_includedir}/tirpc -ltirpc"
#export CFLAGS="$RPM_OPT_FLAGS -fPIC" export CXXFLAGS="%{optflags} -I%{_includedir}/tirpc -ltirpc"
#export CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
mkdir build build-python mkdir build build-python
#Build the standalone executable #Build the standalone executable
pushd build pushd build
@ -144,7 +144,7 @@ make %{?_smp_mflags}
popd popd
#Build the python module #Build the python module
pushd build-python pushd build-python
%{cmake} %{cmake_opts} -DPYTHON_MODULE=ON -DPYTHON_VERSION=%{python2_version} .. %{cmake} %{cmake_opts} -DPYTHON_MODULE=ON ..
make %{?_smp_mflags} make %{?_smp_mflags}
popd popd
@ -216,6 +216,10 @@ xvfb-run ./xrun.sh
%changelog %changelog
* Wed Feb 21 2018 Orion Poplawski <orion@cora.nwra.com> - 0.9.7-10
- Explicitly use python2
- Build with libtirpc
* Tue Feb 20 2018 Orion Poplawski <orion@cora.nwra.com> - 0.9.7-10 * Tue Feb 20 2018 Orion Poplawski <orion@cora.nwra.com> - 0.9.7-10
- Rebuild for hdf5 1.8.20 - Rebuild for hdf5 1.8.20