rpms/scotch
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop BR lzma, use xz for lzma support

Browse Source
This commit is contained in:
Orion Poplawski 2018-12-01 15:03:50 -07:00
parent 0520e20510
commit 08782a2077
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scotch-Makefile.shared.inc.in
View File

@ -12,7 +12,7 @@ override CFLAGS += -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_FILE_COMPRESS_BZ2 -DCOMMO
-DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME \ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME \
-Drestrict=__restrict -DIDXSIZE64 -Drestrict=__restrict -DIDXSIZE64
CLIBFLAGS = -shared -fPIC CLIBFLAGS = -shared -fPIC
override LDFLAGS += -lz -lbz2 -llzma -llzmadec -lm -lrt -lpthread override LDFLAGS += -lz -lbz2 -llzma -lm -lrt -lpthread
ARFLAGS = -shared -Wl,-soname=$@.$(SOMAJ) $(LDFLAGS) -o ARFLAGS = -shared -Wl,-soname=$@.$(SOMAJ) $(LDFLAGS) -o
CP = cp -av CP = cp -av
LEX = flex LEX = flex

13
scotch.spec
View File

@ -10,7 +10,7 @@
Name: scotch Name: scotch
Summary: Graph, mesh and hypergraph partitioning library Summary: Graph, mesh and hypergraph partitioning library
Version: 6.0.6 Version: 6.0.6
Release: 1%{?dist} Release: 2%{?dist}
License: CeCILL-C License: CeCILL-C
URL: https://gforge.inria.fr/projects/scotch/ URL: https://gforge.inria.fr/projects/scotch/
@ -24,10 +24,7 @@ BuildRequires: flex
BuildRequires: bison BuildRequires: bison
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
%if 0%{?fedora}
BuildRequires: xz-devel BuildRequires: xz-devel
BuildRequires: lzma-devel
%endif
%description %description
Scotch is a software package for graph and mesh/hypergraph partitioning and Scotch is a software package for graph and mesh/hypergraph partitioning and
@ -119,11 +116,6 @@ for file in doc/CeCILL-C_V1-en.txt doc/CeCILL-C_V1-fr.txt; do
iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file
done done
# No lzma-devel in el
%if 0%{?rhel}
sed -i -e s/-llzmadec// -e s/-DCOMMON_FILE_COMPRESS_LZMA// src/Makefile.inc
%endif
cp -a . %{openmpidir} cp -a . %{openmpidir}
cp -a . %{mpichdir} cp -a . %{mpichdir}
@ -277,6 +269,9 @@ popd
%doc doc/scotch_example.f %doc doc/scotch_example.f
%changelog %changelog
* Sat Dec 1 2018 Orion Poplawski <orion@cnwra.com> - 6.0.6-2
- Drop BR lzma, use xz for lzma support
* Mon Jul 16 2018 Sandro Mani <manisandro@gmail.com> - 6.0.6-1 * Mon Jul 16 2018 Sandro Mani <manisandro@gmail.com> - 6.0.6-1
- Update to 6.0.6 - Update to 6.0.6