- x32 rebuild

[packages/UFconfig.git] / UFconfig-config.patch

diff --git a/UFconfig-config.patch b/UFconfig-config.patch
index 3d65fc32fbe110696a5f07e651178f7ba14ceb48..242d16a1762d48797b6beff58ddc3adb1b7a9300 100644 (file)
--- a/UFconfig-config.patch
+++ b/UFconfig-config.patch
@@ -1,25 +1,35 @@
-diff -ur UFconfig/UFconfig.mk UFconfig-config/UFconfig.mk
---- UFconfig/UFconfig.mk       2006-12-12 19:52:47.000000000 +0100
-+++ UFconfig-config/UFconfig.mk        2007-12-07 02:27:46.000000000 +0100
-@@ -43,7 +43,7 @@
- MV = mv -f
+--- UFconfig/UFconfig.mk.orig  2011-12-08 20:19:48.000000000 +0100
++++ UFconfig/UFconfig.mk       2012-01-09 16:20:56.743005449 +0100
+@@ -53,7 +53,7 @@
+ # default make environment.
  
- # Fortran compiler (not normally required)
--F77 = f77
-+F77 = gfortran
- F77FLAGS = -O
+ # C and C++ compiler flags.  The first three are standard for *.c and *.cpp
+-CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
++CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fPIC
+ 
+ # ranlib, and ar, for generating libraries.  If you don't need ranlib,
+ # just change it to RANLAB = echo
+@@ -67,15 +67,16 @@
+ 
+ # Fortran compiler (not required for 'make' or 'make library')
+ F77 = gfortran
+-F77FLAGS = $(FFLAGS) -O
++F77FLAGS = $(FFLAGS)
  F77LIB =
  
-@@ -73,7 +73,7 @@
- # These settings will probably not work, since there is no fixed convention for
- # naming the BLAS and LAPACK library (*.a or *.so) files.  Assume the Goto
- # BLAS are available.
--BLAS = -lgoto -lgfortran -lgfortranbegin
-+BLAS = -lblas
- LAPACK = -llapack
+ # C and Fortran libraries
+ LIB = -lm
+ 
+ # For "make install"
+-INSTALL_LIB = /usr/local/lib
+-INSTALL_INCLUDE = /usr/local/include
++INSTALL_PREFIX = /usr
++INSTALL_LIB = $(INSTALL_PREFIX)/lib
++INSTALL_INCLUDE = $(INSTALL_PREFIX)/include
  
- # The BLAS might not contain xerbla, an error-handling routine for LAPACK and
-@@ -102,8 +102,8 @@
+ # For compiling MATLAB mexFunctions (MATLAB 7.5 or later)
+ MEX = mex -O -largeArrayDims -lmwlapack -lmwblas
+@@ -148,8 +149,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.
@@ -28,5 +38,5 @@ diff -ur UFconfig/UFconfig.mk UFconfig-config/UFconfig.mk
 +METIS_PATH = /usr/include/metis
 +METIS = -lmetis
  
- # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
- # options:
+ #------------------------------------------------------------------------------
+ # UMFPACK configuration: