From b2e0b6eb2b492e2f4e209291e89b1331130e98e3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 21 Feb 2018 09:15:32 -0700 Subject: [PATCH] Explicitly use python2 Build with libtirpc --- gdl.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gdl.spec b/gdl.spec index ba65a45..ab596af 100644 --- a/gdl.spec +++ b/gdl.spec @@ -126,6 +126,7 @@ popd -DUDUNITS_INCLUDE_DIR=%{_includedir}/udunits2 \\\ -DGRIB=ON \\\ -DOPENMP=ON \\\ + -DPYTHON_EXECUTABLE=%{_bindir}/python2 \\\ %{?cmake_qhull} \\\ %{nil} # TODO - build an mpi version @@ -133,9 +134,8 @@ popd # --with-mpich=%{_libdir}/mpich2 \ %build -# Build convenience .a libraries with -fPIC -#export CFLAGS="$RPM_OPT_FLAGS -fPIC" -#export CXXFLAGS="$RPM_OPT_FLAGS -fPIC" +export CFLAGS="%{optflags} -I%{_includedir}/tirpc -ltirpc" +export CXXFLAGS="%{optflags} -I%{_includedir}/tirpc -ltirpc" mkdir build build-python #Build the standalone executable pushd build @@ -144,7 +144,7 @@ make %{?_smp_mflags} popd #Build the python module pushd build-python -%{cmake} %{cmake_opts} -DPYTHON_MODULE=ON -DPYTHON_VERSION=%{python2_version} .. +%{cmake} %{cmake_opts} -DPYTHON_MODULE=ON .. make %{?_smp_mflags} popd @@ -216,6 +216,10 @@ xvfb-run ./xrun.sh %changelog +* Wed Feb 21 2018 Orion Poplawski - 0.9.7-10 +- Explicitly use python2 +- Build with libtirpc + * Tue Feb 20 2018 Orion Poplawski - 0.9.7-10 - Rebuild for hdf5 1.8.20