From: Jakub Bogusz Date: Wed, 1 Oct 2014 15:21:08 +0000 (+0200) Subject: - updated to 4.3.1 X-Git-Tag: auto/th/SuiteSparse_config-4.3.1-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=28d891a05448e1a3c9fdd90548675f925cedf3f2;p=packages%2FSuiteSparse_config.git - updated to 4.3.1 - updated config,shared patches --- diff --git a/SuiteSparse_config-config.patch b/SuiteSparse_config-config.patch index 5aec886..1347a5b 100644 --- a/SuiteSparse_config-config.patch +++ b/SuiteSparse_config-config.patch @@ -1,15 +1,15 @@ ---- SuiteSparse_config/SuiteSparse_config.mk.orig 2012-06-01 21:25:05.000000000 +0200 -+++ SuiteSparse_config/SuiteSparse_config.mk 2012-06-26 19:19:18.178725712 +0200 -@@ -60,7 +60,7 @@ +--- SuiteSparse_config/SuiteSparse_config.mk.orig 2014-08-16 21:22:58.000000000 +0200 ++++ SuiteSparse_config/SuiteSparse_config.mk 2014-10-01 17:06:23.286761684 +0200 +@@ -69,7 +69,7 @@ # C and C++ compiler flags. The first three are standard for *.c and *.cpp # Add -DNTIMER if you do use any timing routines (otherwise -lrt is required). # CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER - CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC +CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fPIC + # for the MKL BLAS: + # CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE - # ranlib, and ar, for generating libraries. If you don't need ranlib, - # just change it to RANLAB = echo -@@ -73,7 +73,7 @@ +@@ -84,7 +84,7 @@ # Fortran compiler (not required for 'make' or 'make library') F77 = gfortran @@ -18,7 +18,7 @@ F77LIB = # C and Fortran libraries. Remove -lrt if you don't have it. -@@ -82,8 +82,9 @@ +@@ -93,8 +93,9 @@ # LIB = -lm # For "make install" @@ -30,7 +30,7 @@ # Which version of MAKE you are using (default is "make") # MAKE = make -@@ -162,8 +163,8 @@ +@@ -210,8 +211,8 @@ # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. # You may wish to use an absolute path. METIS is optional. Compile # CHOLMOD with -DNPARTITION if you do not wish to use METIS. diff --git a/SuiteSparse_config-shared.patch b/SuiteSparse_config-shared.patch index 075dd29..61a9776 100644 --- a/SuiteSparse_config-shared.patch +++ b/SuiteSparse_config-shared.patch @@ -20,7 +20,7 @@ - - $(RM) SuiteSparse_config.o +libsuitesparseconfig.la: SuiteSparse_config.c SuiteSparse_config.h + libtool --mode=compile --tag=CC $(CC) $(CF) -c SuiteSparse_config.c -+ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o libsuitesparseconfig.la SuiteSparse_config.lo -lrt -rpath $(INSTALL_LIB) ++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o libsuitesparseconfig.la SuiteSparse_config.lo -lrt -lm -rpath $(INSTALL_LIB) distclean: purge diff --git a/SuiteSparse_config.spec b/SuiteSparse_config.spec index 062482e..0d10125 100644 --- a/SuiteSparse_config.spec +++ b/SuiteSparse_config.spec @@ -1,12 +1,12 @@ Summary: SuiteSparse_config development files Summary(pl.UTF-8): Pliki programistyczne SuiteSparse_config Name: SuiteSparse_config -Version: 4.2.1 +Version: 4.3.1 Release: 1 License: no restrictions Group: Development Source0: http://www.cise.ufl.edu/research/sparse/UFconfig/%{name}-%{version}.tar.gz -# Source0-md5: f9d709f442ab13e0cf0f53d6b516abd1 +# Source0-md5: 14872b930c8625362f11a847d07a6ede Patch0: %{name}-config.patch Patch1: %{name}-shared.patch URL: http://www.cise.ufl.edu/research/sparse/UFconfig/