From d1ac72a69fec20efcbe2b1b8260a42283aaf3a0d Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 26 Apr 2013 20:00:17 +0200 Subject: [PATCH] - adjusted spec and shared patch for NPARTITION (no metis) build - require SuiteSparse_config 4.2.0 (SuiteSparse_version required) --- CHOLMOD-shared.patch | 2 +- CHOLMOD.spec | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHOLMOD-shared.patch b/CHOLMOD-shared.patch index 8148d67..b136120 100644 --- 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.la -lamd -lcolamd \ ++LIB2 = ../Lib/libcholmod.la -lsuitesparseconfig -lamd -lcolamd \ $(LIB_WITH_PARTITION) $(LAPACK) $(BLAS) $(XERBLA) $(LIB) #------------------------------------------------------------------------------- diff --git a/CHOLMOD.spec b/CHOLMOD.spec index 6b77594..e0f9585 100644 --- 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: SuiteSparse_config-devel >= 4.1.0 +BuildRequires: SuiteSparse_config-devel >= 4.2.0 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: SuiteSparse_config-libs >= 4.1.0 +Requires: SuiteSparse_config-libs >= 4.2.0 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: SuiteSparse_config-devel >= 4.0.0 +Requires: SuiteSparse_config-devel >= 4.2.0 %description devel Header files for CHOLMOD library. @@ -81,6 +81,7 @@ Statyczna biblioteka CHOLMOD. %build %{__make} \ CC="%{__cc}" \ + %{!?with_metis:CHOLMOD_CONFIG=-DNPARTITION} \ %{?with_metis:WITH_METIS=1} \ CFLAGS="%{rpmcflags}" \ LDFLAGS="%{rpmldflags}" \ -- 2.43.0