[76577] trunk/dports/math/DSDP

28 Feb 2011

Revision: 76577
          http://trac.macports.org/changeset/76577
Author:   mnick@macports.org
Date:     2011-02-28 12:35:20 -0800 (Mon, 28 Feb 2011)
Log Message:
-----------
use configure.cc for building DSDP (closes #28399)

Modified Paths:
--------------
    trunk/dports/math/DSDP/Portfile

Added Paths:
-----------
    trunk/dports/math/DSDP/files/patch-make.include.diff

Removed Paths:
-------------
    trunk/dports/math/DSDP/files/make.include.diff

Modified: trunk/dports/math/DSDP/Portfile
===================================================================

--- trunk/dports/math/DSDP/Portfile	2011-02-28 20:21:06 UTC (rev 76576)
+++ trunk/dports/math/DSDP/Portfile	2011-02-28 20:35:20 UTC (rev 76577)
@@ -4,7 +4,7 @@
 
 name                DSDP
 version             5.8
-revision            1
+revision            2
 maintainers         mnick
 
 categories          math science
@@ -28,7 +28,7 @@
 
 depends_lib         port:atlas
 
-patchfiles          make.include.diff
+patchfiles          patch-make.include.diff
 
 build.target        dsdpapi
 build.env-append    DSDPROOT=${worksrcpath} 
@@ -38,6 +38,10 @@
     depends_lib-append      port:octave
 }
 
+post-patch { 	
+    reinplace -E "s|@@MP_CC@@|${configure.cc}|g" \
+        ${worksrcpath}/make.include
+}
 destroot {
     xinstall ${worksrcpath}/lib/libdsdp.a ${destroot}${prefix}/lib
     eval xinstall [glob ${worksrcpath}/include/*] ${destroot}${prefix}/include

Deleted: trunk/dports/math/DSDP/files/make.include.diff
===================================================================
--- trunk/dports/math/DSDP/files/make.include.diff	2011-02-28 20:21:06 UTC (rev 76576)
+++ trunk/dports/math/DSDP/files/make.include.diff	2011-02-28 20:35:20 UTC (rev 76577)
@@ -1,29 +0,0 @@
---- make.include.orig	2009-07-04 02:00:00.000000000 +0200
-+++ make.include	2009-07-04 02:01:42.000000000 +0200
-@@ -32,7 +32,7 @@
- #DSDPTIMER  = DSDP_MS_TIME
- 
- # STEP 3c: Add other compiler flags.
--DSDPCFLAGS = 
-+DSDPCFLAGS = -DDSDP_TIME -I/usr/include/sys
- #DSDPCFLAGS = -Wall
- #DSDPCFLAGS = -DDSDPMATLAB
- #  Other flags concern BLAS and LAPACK libraries -- see next step.
-@@ -55,7 +55,7 @@
- # Not needed to compile library or matlab executable
- # Needed to link DSDP library to the driver ( read SDPA files, maxcut example, ...)
- # Also include the math library and other libraries needed to link the BLAS to the C files that call them.
--LAPACKBLAS  = -llapack -lblas -lg2c -lm
-+LAPACKBLAS  = -llapack -lblas -lm
- #LAPACKBLAS  = -L/usr/lib/ -llapack -lblas -lg2c -lm
- #LAPACKBLAS  = -L/home/benson/ATLAS/Linux_P4SSE2/lib -llapack -lcblas -lf77blas -latlas -lg2c -lm
- #LAPACKBLAS  = -L/sandbox/benson/ATLAS-3.6/lib/Linux_P4SSE2  -llapack -lcblas -lf77blas -latlas -lg2c -lm 
-@@ -63,7 +63,7 @@
- 
- 
- # STEP 6, MATLAB MACROS - If compiling Matlab interface, check MEX flag.
--MEX           = mex -O
-+MEX           = mkoctfile --mex
- #MEX     = C:\Matlab\bin\mex
- DSDPMATLABDIR = ${DSDPROOT}/matlab
- 

Added: trunk/dports/math/DSDP/files/patch-make.include.diff
===================================================================
--- trunk/dports/math/DSDP/files/patch-make.include.diff	                        (rev 0)
+++ trunk/dports/math/DSDP/files/patch-make.include.diff	2011-02-28 20:35:20 UTC (rev 76577)
@@ -0,0 +1,38 @@
+--- make.include.orig	2011-02-28 21:29:20.000000000 +0100
++++ make.include	2011-02-28 21:29:55.000000000 +0100
+@@ -6,7 +6,7 @@
+ #   the defaults below should work, although fast BLAS and LAPACK recommended.
+ 
+ # STEP 2: Set the name of the C compiler. 
+-CC       = gcc
++CC       = @@MP_CC@@
+ #CC       = cc 
+ #CC       = g++ 
+ #CC       = mpicc
+@@ -32,7 +32,7 @@
+ #DSDPTIMER  = DSDP_MS_TIME
+ 
+ # STEP 3c: Add other compiler flags.
+-DSDPCFLAGS = 
++DSDPCFLAGS = -DDSDP_TIME -I/usr/include/sys
+ #DSDPCFLAGS = -Wall
+ #DSDPCFLAGS = -DDSDPMATLAB
+ #  Other flags concern BLAS and LAPACK libraries -- see next step.
+@@ -55,7 +55,7 @@
+ # Not needed to compile library or matlab executable
+ # Needed to link DSDP library to the driver ( read SDPA files, maxcut example, ...)
+ # Also include the math library and other libraries needed to link the BLAS to the C files that call them.
+-LAPACKBLAS  = -llapack -lblas -lg2c -lm
++LAPACKBLAS  = -llapack -lblas -lm
+ #LAPACKBLAS  = -L/usr/lib/ -llapack -lblas -lg2c -lm
+ #LAPACKBLAS  = -L/home/benson/ATLAS/Linux_P4SSE2/lib -llapack -lcblas -lf77blas -latlas -lg2c -lm
+ #LAPACKBLAS  = -L/sandbox/benson/ATLAS-3.6/lib/Linux_P4SSE2  -llapack -lcblas -lf77blas -latlas -lg2c -lm 
+@@ -63,7 +63,7 @@
+ 
+ 
+ # STEP 6, MATLAB MACROS - If compiling Matlab interface, check MEX flag.
+-MEX           = mex -O
++MEX           = mkoctfile --mex
+ #MEX     = C:\Matlab\bin\mex
+ DSDPMATLABDIR = ${DSDPROOT}/matlab
+

    

[76577] trunk/dports/math/DSDP

mnick＠macports.org