Skip to content

Commit

Permalink
io-libs/adios: restore .spec from v1.3.3 branch for rebuild (#702)
Browse files Browse the repository at this point in the history
Signed-off-by: Karl W. Schulz <karl@ices.utexas.edu>
  • Loading branch information
koomie committed Apr 20, 2018
1 parent ef87543 commit b1d7150
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions components/io-libs/adios/SPECS/adios.spec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

Summary: The Adaptable IO System (ADIOS)
Name: %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
Version: 1.13.0
Version: 1.12.0
Release: 1%{?dist}
License: BSD-3-Clause
Group: %{PROJ_NAME}/io-libs
Expand Down Expand Up @@ -56,9 +56,7 @@ BuildRequires: python-numpy-%{compiler_family}%{PROJ_DELIM}

%if 0%{?sles_version} || 0%{?suse_version}
# define fdupes, clean up rpmlint errors
BuildRequires: fdupes libcurl4 libcurl-devel
%else
BuildRequires: libcurl libcurl-devel
BuildRequires: fdupes
%endif

# Default library install path
Expand Down Expand Up @@ -89,7 +87,7 @@ sed -i "s|@64@|$LIBSUFF|" wrappers/numpy/setup*
module load autotools
module load phdf5
module load netcdf
module load py2-numpy
module load numpy

TOPDIR=$PWD

Expand Down Expand Up @@ -163,7 +161,7 @@ export PATH=$(pwd):$PATH
%if "%{compiler_family}" != "intel"
module load openblas
%endif
module load py2-numpy
module load numpy
export CFLAGS="-I$NUMPY_DIR$PPATH/numpy/core/include -I$(pwd)/src/public -L$(pwd)/src"
pushd wrappers/numpy
make MPI=y python
Expand Down

0 comments on commit b1d7150

Please sign in to comment.