rpms/ufsparse/devel ufsparse-0.92-Makefile-patch, NONE, 1.1 ufsparse.spec, 1.7, 1.8

Quentin Spencer (qspencer) fedora-extras-commits at redhat.com
Mon Dec 19 20:32:38 UTC 2005


Author: qspencer

Update of /cvs/extras/rpms/ufsparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7833

Modified Files:
	ufsparse.spec 
Added Files:
	ufsparse-0.92-Makefile-patch 
Log Message:
Add patch0. Fails on x86_64 without it.


--- NEW FILE ufsparse-0.92-Makefile-patch ---
--- LDL/Makefile.~1~	2005-11-15 12:35:51.000000000 -0600
+++ LDL/Makefile	2005-12-19 14:22:39.000000000 -0600
@@ -6,6 +6,8 @@
 
 include ../UFconfig/UFconfig.mk
 
+C = $(CC) $(CFLAGS)
+
 all: intro libldl.a ldlsimple ldlmain ldlamd
 
 intro:
@@ -24,7 +26,7 @@
 #-------------------------------------------------------------------------------
 
 libldl.a: ldl.c ldl.h
-	$(CC) -c -O ldl.c -o ldl.o
+	$(C) -c ldl.c -o ldl.o
 	$(AR) libldl.a ldl.o
 	- $(RANLIB) libldl.a
 
@@ -33,18 +35,18 @@
 #-------------------------------------------------------------------------------
 
 ldlmain:  ldlmain.c libldl.a
-	$(CC) -O ldlmain.c libldl.a -o ldlmain -lm
+	$(C)  ldlmain.c libldl.a -o ldlmain -lm
 	- ./ldlmain > my_ldlmain.out
 	- diff ldlmain.out my_ldlmain.out
 
 ldlsimple:  ldlsimple.c libldl.a
-	$(CC) -O ldlsimple.c libldl.a -o ldlsimple -lm
+	$(C) ldlsimple.c libldl.a -o ldlsimple -lm
 	- ./ldlsimple > my_ldlsimple.out
 	- diff ldlsimple.out my_ldlsimple.out
 
 ldlamd:  ldlmain.c libldl.a
 	- make -C ../AMD
-	- $(CC) -O -I../AMD/Include -L../AMD/Lib -DUSE_AMD ldlmain.c -lamd libldl.a -o ldlamd -lm
+	- $(C) -I../AMD/Include -L../AMD/Lib -DUSE_AMD ldlmain.c -lamd libldl.a -o ldlamd -lm
 	- ./ldlamd > my_ldlamd.out
 	- diff ldlamd.out my_ldlamd.out
 


Index: ufsparse.spec
===================================================================
RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ufsparse.spec	14 Dec 2005 15:56:07 -0000	1.7
+++ ufsparse.spec	19 Dec 2005 20:32:36 -0000	1.8
@@ -1,12 +1,13 @@
 Name:           ufsparse
 Version:        0.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        University of Florida sparse matrix libraries
 
 Group:          System Environment/Libraries
 License:        Distributable
 URL:            http://www.cise.ufl.edu/research/sparse/umfpack/
 Source0:        http://www.cise.ufl.edu/research/sparse/beta/Dec8_2005/UFsparse.tar.gz
+Patch0:         ufsparse-0.92-Makefile-patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  blas-devel
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q -n UFsparse
+%patch -p0
 chmod -R a+r *
 
 %build
@@ -233,6 +235,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Dec 14 2005 Quentin Spencer <qspencer at users.sourceforge.net> 0.92-2
+- Add patch0--fixes LDL/Makefile so CFLAGS are used when compiling ldl.a.
+
 * Wed Dec 14 2005 Quentin Spencer <qspencer at users.sourceforge.net> 0.92-1
 - Update to Dec 8 2005 version.
 




More information about the scm-commits mailing list