- adjusted spec and shared patch for NPARTITION (no metis) build

- require SuiteSparse_config 4.2.0 (SuiteSparse_version required)

diff --git a/CHOLMOD-shared.patch b/CHOLMOD-shared.patch
index 8148d670c49048abfad46fbba546b73d9bf9ddbc..b136120cdb1e4bfceb32367b09aa4cf9068500f1 100644 (file)
--- a/CHOLMOD-shared.patch
+++ b/CHOLMOD-shared.patch
@@ -44,7 +44,7 @@
  
 -LIB2 = ../Lib/libcholmod.a ../../AMD/Lib/libamd.a ../../COLAMD/Lib/libcolamd.a \
 -        ../../SuiteSparse_config/libsuitesparseconfig.a \
  
 -LIB2 = ../Lib/libcholmod.a ../../AMD/Lib/libamd.a ../../COLAMD/Lib/libcolamd.a \
 -        ../../SuiteSparse_config/libsuitesparseconfig.a \

-+LIB2 = ../Lib/libcholmod.la -lamd -lcolamd \
++LIB2 = ../Lib/libcholmod.la -lsuitesparseconfig -lamd -lcolamd \

        $(LIB_WITH_PARTITION) $(LAPACK) $(BLAS) $(XERBLA) $(LIB)
  
  #-------------------------------------------------------------------------------
        $(LIB_WITH_PARTITION) $(LAPACK) $(BLAS) $(XERBLA) $(LIB)
  
  #-------------------------------------------------------------------------------

diff --git a/CHOLMOD.spec b/CHOLMOD.spec
index 6b77594fa97960267b6971512f0b3a515069421f..e0f95851454529ba4dc09ba9606a1c0fa0925500 100644 (file)
--- a/CHOLMOD.spec
+++ b/CHOLMOD.spec
@@ -20,7 +20,7 @@ BuildRequires:        AMD-devel >= 2.3.0
 BuildRequires: CAMD-devel >= 2.3.0
 BuildRequires: CCOLAMD-devel >= 2.8.0
 BuildRequires: COLAMD-devel >= 2.8.0
 BuildRequires: CAMD-devel >= 2.3.0
 BuildRequires: CCOLAMD-devel >= 2.8.0
 BuildRequires: COLAMD-devel >= 2.8.0

-BuildRequires: SuiteSparse_config-devel >= 4.1.0
+BuildRequires: SuiteSparse_config-devel >= 4.2.0

 BuildRequires: blas-devel
 BuildRequires: gcc-fortran
 BuildRequires: lapack-devel
 BuildRequires: blas-devel
 BuildRequires: gcc-fortran
 BuildRequires: lapack-devel


@@ -32,7 +32,7 @@ Requires:     AMD >= 2.3.0
 Requires:      CAMD >= 2.3.0
 Requires:      CCOLAMD >= 2.8.0
 Requires:      COLAMD >= 2.8.0
 Requires:      CAMD >= 2.3.0
 Requires:      CCOLAMD >= 2.8.0
 Requires:      COLAMD >= 2.8.0

-Requires:      SuiteSparse_config-libs >= 4.1.0
+Requires:      SuiteSparse_config-libs >= 4.2.0

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -52,7 +52,7 @@ Requires:     AMD-devel >= 2.3.0
 Requires:      CAMD-devel >= 2.3.0
 Requires:      CCOLAMD-devel >= 2.8.0
 Requires:      COLAMD-devel >= 2.8.0
 Requires:      CAMD-devel >= 2.3.0
 Requires:      CCOLAMD-devel >= 2.8.0
 Requires:      COLAMD-devel >= 2.8.0

-Requires:      SuiteSparse_config-devel >= 4.0.0
+Requires:      SuiteSparse_config-devel >= 4.2.0

 
 %description devel
 Header files for CHOLMOD library.
 
 %description devel
 Header files for CHOLMOD library.


@@ -81,6 +81,7 @@ Statyczna biblioteka CHOLMOD.
 %build
 %{__make} \
        CC="%{__cc}" \
 %build
 %{__make} \
        CC="%{__cc}" \

+       %{!?with_metis:CHOLMOD_CONFIG=-DNPARTITION} \

        %{?with_metis:WITH_METIS=1} \
        CFLAGS="%{rpmcflags}" \
        LDFLAGS="%{rpmldflags}" \
        %{?with_metis:WITH_METIS=1} \
        CFLAGS="%{rpmcflags}" \
        LDFLAGS="%{rpmldflags}" \