- Updated summary
- Use cmake3 for EPEL7 compatibility - Run tests on supported pocl arches
This commit is contained in:
Orion Poplawski
parent
89564d6c8e
commit
afc62e68d4
|
|
@ -1,2 +1,2 @@
|
|||
/v0.1.6.tar.gz
|
||||
/v0.1.7.tar.gz
|
||||
/ASL-0.1.7.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
diff --git a/src/utilities/aslParametersManager.cxx b/src/utilities/aslParametersManager.cxx
|
||||
index 98a0192..d6ef3c7 100644
|
||||
--- a/src/utilities/aslParametersManager.cxx
|
||||
+++ b/src/utilities/aslParametersManager.cxx
|
||||
@@ -332,7 +332,7 @@ namespace asl
|
||||
|
||||
try
|
||||
{
|
||||
- ifstream ifs(paramFile);
|
||||
+ std::ifstream ifs(paramFile);
|
||||
if (!ifs.good())
|
||||
errorMessage("Can not open parameters file: " + paramFile);
|
||||
|
||||
@@ -357,7 +357,7 @@ namespace asl
|
||||
|
||||
void ParametersManager::writeParametersFile(const std::string fileName)
|
||||
{
|
||||
- ofstream fo(fileName);
|
||||
+ std::ofstream fo(fileName);
|
||||
if (!fo.good())
|
||||
errorMessage("ParametersManager::writeParametersFile() - can not open file: " + fileName);
|
||||
|
||||
@@ -463,7 +463,7 @@ namespace asl
|
||||
}
|
||||
else
|
||||
{
|
||||
- ifstream ifs(p.string());
|
||||
+ std::ifstream ifs(p.string());
|
||||
if (ifs.good())
|
||||
{
|
||||
parsed_options parsed = parse_config_file(ifs, allOptions, true);
|
||||
@@ -514,4 +514,4 @@ namespace asl
|
||||
}
|
||||
}
|
||||
|
||||
-} //namespace asl
|
||||
\ No newline at end of file
|
||||
+} //namespace asl
|
||||
44
libASL.spec
44
libASL.spec
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
Name: lib%{upstream}
|
||||
Version: 0.1.7
|
||||
Release: 1%{?dist}
|
||||
Summary: Advanced Simulation Library
|
||||
Release: 2%{?dist}
|
||||
Summary: Advanced Simulation Library hardware accelerated multiphysics simulation platform
|
||||
|
||||
License: AGPLv3 and BSD and MIT
|
||||
# ===== License-breakdown =====
|
||||
|
|
@ -27,13 +27,10 @@ License: AGPLv3 and BSD and MIT
|
|||
#
|
||||
|
||||
URL: http://asl.org.il/
|
||||
Source0: https://github.com/AvtechScientific/%{upstream}/archive/v%{version}.tar.gz
|
||||
|
||||
# Added patch to fix compilation on rawhide: https://github.com/AvtechScientific/ASL/pull/18
|
||||
#Patch0: libASL-fix-namespace-ifstream-ofstream.patch
|
||||
Source0: https://github.com/AvtechScientific/%{upstream}/archive/v%{version}/%{upstream}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: cmake3
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: matio-devel
|
||||
|
|
@ -41,6 +38,12 @@ BuildRequires: netcdf-cxx-devel
|
|||
BuildRequires: ocl-icd-devel
|
||||
BuildRequires: opencl-headers
|
||||
BuildRequires: vtk-devel
|
||||
# For tests, pocl not available on EPEL
|
||||
%if 0%{?fedora}
|
||||
%ifnarch aarch64 ppc64 ppc64le s390 s390x
|
||||
BuildRequires: pocl-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description
|
||||
Advanced Simulation Library (ASL) is a free and open source hardware
|
||||
|
|
@ -102,15 +105,14 @@ The %{name}-examples package contains examples for %{name}
|
|||
|
||||
%prep
|
||||
%setup -q -n %{upstream}-%{version}
|
||||
#%%patch0 -p1
|
||||
%{__mkdir_p} %{_cmake_build_subdir}
|
||||
|
||||
%build
|
||||
pushd %{_cmake_build_subdir}
|
||||
%cmake -DWITH_API_DOC:BOOL=ON \
|
||||
-DWITH_MATIO:BOOL=ON \
|
||||
-DWITH_EXAMPLES=ON \
|
||||
-DWITH_TESTS=ON ..
|
||||
%cmake3 -DWITH_API_DOC:BOOL=ON \
|
||||
-DWITH_MATIO:BOOL=ON \
|
||||
-DWITH_EXAMPLES=ON \
|
||||
-DWITH_TESTS=ON ..
|
||||
make %{?_smp_mflags}
|
||||
popd
|
||||
|
||||
|
|
@ -123,8 +125,21 @@ find %{buildroot} -name '*.la' -delete
|
|||
%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-doc
|
||||
mv %{buildroot}%{_docdir}/%{upstream}/html %{buildroot}%{_docdir}/%{name}-doc
|
||||
mv %{buildroot}%{_docdir}/%{upstream}/examples %{buildroot}%{_docdir}/%{name}-examples
|
||||
# Move input data for examples
|
||||
# https://github.com/AvtechScientific/ASL/commit/0246d6adb1ebded5b2ef1d0e82433f86d90ea4ba
|
||||
mv %{buildroot}%{_datadir}/%{upstream}/input %{buildroot}%{_docdir}/%{name}-examples
|
||||
|
||||
|
||||
%if 0%{?fedora}
|
||||
%check
|
||||
pushd %{_cmake_build_subdir}
|
||||
# Test failures
|
||||
# https://github.com/AvtechScientific/ASL/issues/16
|
||||
ctest3 -E 'testPrivateVar|testReductionFunction'
|
||||
ctest3 -R 'testPrivateVar|testReductionFunction' || :
|
||||
%endif
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
|
@ -186,6 +201,11 @@ mv %{buildroot}%{_datadir}/%{upstream}/input %{buildroot}%{_docdir}/%{name}-exam
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 09 2016 Orion Poplawski <orion@cora.nwra.com> - 0.1.7-2
|
||||
- Updated summary
|
||||
- Use cmake3 for EPEL7 compatibility
|
||||
- Run tests on supported pocl arches
|
||||
|
||||
* Wed Nov 09 2016 Christian Dersch <lupinix@mailbox.org> - 0.1.7-1
|
||||
- new version
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue