Changeset 3168

Timestamp:

03/03/10 15:20:43 (15 years ago)

Author:

jschierm

Message:

Scotch: fix problem compiling with Matlab 7.8.

Location:

issm/trunk/externalpackages/scotch

Files:

• scotch.patch (modified) (38 diffs)
• scotch_jes_notes.txt (modified) (2 diffs)

issm/trunk/externalpackages/scotch/scotch.patch

@@ -4 +4 @@
 diff -rc src/src/libscotch/arch.c new/src/libscotch/arch.c
 *** src/src/libscotch/arch.c    2008-09-27 07:48:01.000000000 -0700
---- new/src/libscotch/arch.c    2010-02-10 11:23:26.442951850 -0800
+--- new/src/libscotch/arch.c    2010-03-03 14:06:15.166926170 -0800
 ***************
 *** 173,187 ****
@@ -70 +70 @@
 diff -rc src/src/libscotch/arch_cmplt.c new/src/libscotch/arch_cmplt.c
 *** src/src/libscotch/arch_cmplt.c      2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_cmplt.c      2010-02-10 11:23:26.449951858 -0800
+--- new/src/libscotch/arch_cmplt.c      2010-03-03 14:06:15.171926172 -0800
 ***************
 *** 90,99 ****
@@ -122 +122 @@
 diff -rc src/src/libscotch/arch_cmplt.h new/src/libscotch/arch_cmplt.h
 *** src/src/libscotch/arch_cmplt.h      2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_cmplt.h      2010-02-10 11:23:26.455951865 -0800
+--- new/src/libscotch/arch_cmplt.h      2010-03-03 14:06:15.178926175 -0800
 ***************
 *** 87,93 ****
@@ -139 +139 @@
 diff -rc src/src/libscotch/arch_cmpltw.c new/src/libscotch/arch_cmpltw.c
 *** src/src/libscotch/arch_cmpltw.c     2008-08-27 14:22:22.000000000 -0700
---- new/src/libscotch/arch_cmpltw.c     2010-02-10 11:23:26.462951873 -0800
+--- new/src/libscotch/arch_cmpltw.c     2010-03-03 14:06:15.184926177 -0800
 ***************
 *** 200,211 ****
@@ -211 +211 @@
 diff -rc src/src/libscotch/arch_cmpltw.h new/src/libscotch/arch_cmpltw.h
 *** src/src/libscotch/arch_cmpltw.h     2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_cmpltw.h     2010-02-10 11:23:26.469951882 -0800
+--- new/src/libscotch/arch_cmpltw.h     2010-03-03 14:06:15.189926179 -0800
 ***************
 *** 86,92 ****
@@ -228 +228 @@
 diff -rc src/src/libscotch/arch_deco.c new/src/libscotch/arch_deco.c
 *** src/src/libscotch/arch_deco.c       2008-09-28 06:35:27.000000000 -0700
---- new/src/libscotch/arch_deco.c       2010-02-10 11:23:26.476951890 -0800
+--- new/src/libscotch/arch_deco.c       2010-03-03 14:06:15.195926181 -0800
 ***************
 *** 211,217 ****
@@ -269 +269 @@
 diff -rc src/src/libscotch/arch_deco.h new/src/libscotch/arch_deco.h
 *** src/src/libscotch/arch_deco.h       2008-09-27 07:49:46.000000000 -0700
---- new/src/libscotch/arch_deco.h       2010-02-10 11:23:26.482951897 -0800
+--- new/src/libscotch/arch_deco.h       2010-03-03 14:06:15.201926184 -0800
 ***************
 *** 113,119 ****
@@ -286 +286 @@
 diff -rc src/src/libscotch/arch.h new/src/libscotch/arch.h
 *** src/src/libscotch/arch.h    2009-04-28 08:11:27.000000000 -0700
---- new/src/libscotch/arch.h    2010-02-10 11:23:26.488951904 -0800
+--- new/src/libscotch/arch.h    2010-03-03 14:06:15.207926186 -0800
 ***************
 *** 175,181 ****
@@ -303 +303 @@
 diff -rc src/src/libscotch/arch_hcub.c new/src/libscotch/arch_hcub.c
 *** src/src/libscotch/arch_hcub.c       2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_hcub.c       2010-02-10 11:23:26.495951912 -0800
+--- new/src/libscotch/arch_hcub.c       2010-03-03 14:06:15.213926188 -0800
 ***************
 *** 88,95 ****
@@ -351 +351 @@
 diff -rc src/src/libscotch/arch_hcub.h new/src/libscotch/arch_hcub.h
 *** src/src/libscotch/arch_hcub.h       2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_hcub.h       2010-02-10 11:23:26.501951919 -0800
+--- new/src/libscotch/arch_hcub.h       2010-03-03 14:06:15.219926191 -0800
 ***************
 *** 85,91 ****
@@ -368 +368 @@
 diff -rc src/src/libscotch/arch_mesh.c new/src/libscotch/arch_mesh.c
 *** src/src/libscotch/arch_mesh.c       2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_mesh.c       2010-02-10 11:23:26.508951927 -0800
+--- new/src/libscotch/arch_mesh.c       2010-03-03 14:06:15.225926193 -0800
 ***************
 *** 96,103 ****
@@ -467 +467 @@
 diff -rc src/src/libscotch/arch_mesh.h new/src/libscotch/arch_mesh.h
 *** src/src/libscotch/arch_mesh.h       2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_mesh.h       2010-02-10 11:23:26.514951934 -0800
+--- new/src/libscotch/arch_mesh.h       2010-03-03 14:06:15.232926196 -0800
 ***************
 *** 96,102 ****
@@ -498 +498 @@
 diff -rc src/src/libscotch/arch_tleaf.c new/src/libscotch/arch_tleaf.c
 *** src/src/libscotch/arch_tleaf.c      2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_tleaf.c      2010-02-10 11:23:26.520951941 -0800
+--- new/src/libscotch/arch_tleaf.c      2010-03-03 14:06:15.238926198 -0800
 ***************
 *** 92,99 ****
@@ -556 +556 @@
 diff -rc src/src/libscotch/arch_tleaf.h new/src/libscotch/arch_tleaf.h
 *** src/src/libscotch/arch_tleaf.h      2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_tleaf.h      2010-02-10 11:23:26.526951948 -0800
+--- new/src/libscotch/arch_tleaf.h      2010-03-03 14:06:15.244926201 -0800
 ***************
 *** 89,95 ****
@@ -573 +573 @@
 diff -rc src/src/libscotch/arch_torus.c new/src/libscotch/arch_torus.c
 *** src/src/libscotch/arch_torus.c      2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_torus.c      2010-02-10 11:23:26.533951956 -0800
+--- new/src/libscotch/arch_torus.c      2010-03-03 14:06:15.251926203 -0800
 ***************
 *** 90,97 ****
@@ -672 +672 @@
 diff -rc src/src/libscotch/arch_torus.h new/src/libscotch/arch_torus.h
 *** src/src/libscotch/arch_torus.h      2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/arch_torus.h      2010-02-10 11:23:26.540951964 -0800
+--- new/src/libscotch/arch_torus.h      2010-03-03 14:06:15.257926206 -0800
 ***************
 *** 96,102 ****
@@ -703 +703 @@
 diff -rc src/src/libscotch/common.c new/src/libscotch/common.c
 *** src/src/libscotch/common.c  2008-05-22 06:44:41.000000000 -0700
---- new/src/libscotch/common.c  2010-02-10 11:23:26.546951971 -0800
+--- new/src/libscotch/common.c  2010-03-03 14:06:15.263926208 -0800
 ***************
 *** 100,106 ****
@@ -722 +722 @@
 diff -rc src/src/libscotch/common.h new/src/libscotch/common.h
 *** src/src/libscotch/common.h  2009-02-06 14:20:55.000000000 -0800
---- new/src/libscotch/common.h  2010-02-10 11:23:26.552951978 -0800
+--- new/src/libscotch/common.h  2010-03-03 14:06:15.270926211 -0800
 ***************
 *** 66,71 ****
@@ -758 +758 @@
 diff -rc src/src/libscotch/dummysizes.c new/src/libscotch/dummysizes.c
 *** src/src/libscotch/dummysizes.c      2009-05-09 16:08:02.000000000 -0700
---- new/src/libscotch/dummysizes.c      2010-02-10 11:23:26.558951985 -0800
+--- new/src/libscotch/dummysizes.c      2010-03-03 14:06:15.276926213 -0800
 ***************
 *** 267,271 ****
@@ -771 +771 @@
 diff -rc src/src/libscotch/graph.c new/src/libscotch/graph.c
 *** src/src/libscotch/graph.c   2008-05-22 06:44:42.000000000 -0700
---- new/src/libscotch/graph.c   2010-02-10 11:23:26.564951992 -0800
+--- new/src/libscotch/graph.c   2010-03-03 14:06:15.283926216 -0800
 ***************
 *** 135,141 ****
@@ -794 +794 @@
 diff -rc src/src/libscotch/graph.h new/src/libscotch/graph.h
 *** src/src/libscotch/graph.h   2008-06-01 02:49:11.000000000 -0700
---- new/src/libscotch/graph.h   2010-02-10 11:23:26.570951999 -0800
+--- new/src/libscotch/graph.h   2010-03-03 14:06:15.289926218 -0800
 ***************
 *** 159,165 ****
@@ -811 +811 @@
 diff -rc src/src/libscotch/graph_io.c new/src/libscotch/graph_io.c
 *** src/src/libscotch/graph_io.c        2008-05-22 06:44:42.000000000 -0700
---- new/src/libscotch/graph_io.c        2010-02-10 11:23:26.577952008 -0800
+--- new/src/libscotch/graph_io.c        2010-03-03 14:06:15.297926222 -0800
 ***************
 *** 86,92 ****
@@ -1049 +1049 @@
 diff -rc src/src/libscotch/graph_io_scot.c new/src/libscotch/graph_io_scot.c
 *** src/src/libscotch/graph_io_scot.c   2008-05-22 06:44:42.000000000 -0700
---- new/src/libscotch/graph_io_scot.c   2010-02-10 11:23:26.584952016 -0800
+--- new/src/libscotch/graph_io_scot.c   2010-03-03 14:06:15.304926224 -0800
 ***************
 *** 89,95 ****
@@ -1066 +1066 @@
 diff -rc src/src/libscotch/library_arch.c new/src/libscotch/library_arch.c
 *** src/src/libscotch/library_arch.c    2008-05-22 06:44:42.000000000 -0700
---- new/src/libscotch/library_arch.c    2010-02-10 11:23:26.605952040 -0800
+--- new/src/libscotch/library_arch.c    2010-03-03 14:06:15.310926227 -0800
 ***************
 *** 120,128 ****
@@ -1101 +1101 @@
 diff -rc src/src/libscotch/library_arch_f.c new/src/libscotch/library_arch_f.c
 *** src/src/libscotch/library_arch_f.c  2008-05-22 06:44:42.000000000 -0700
---- new/src/libscotch/library_arch_f.c  2010-02-10 11:23:26.611952047 -0800
+--- new/src/libscotch/library_arch_f.c  2010-03-03 14:06:15.317926230 -0800
 ***************
 *** 121,127 ****
@@ -1118 +1118 @@
 diff -rc src/src/libscotch/library_error_exit.c new/src/libscotch/library_error_exit.c
 *** src/src/libscotch/library_error_exit.c      2009-01-20 00:36:33.000000000 -0800
---- new/src/libscotch/library_error_exit.c      2010-02-10 11:23:26.617952054 -0800
+--- new/src/libscotch/library_error_exit.c      2010-03-03 14:06:15.323926232 -0800
 ***************
 *** 114,119 ****
@@ -1193 +1193 @@
 diff -rc src/src/libscotch/library_graph.c new/src/libscotch/library_graph.c
 *** src/src/libscotch/library_graph.c   2008-05-22 07:28:12.000000000 -0700
---- new/src/libscotch/library_graph.c   2010-02-10 11:23:26.623952061 -0800
+--- new/src/libscotch/library_graph.c   2010-03-03 14:06:15.329926234 -0800
 ***************
 *** 137,143 ****
@@ -1238 +1238 @@
 diff -rc src/src/libscotch/library_graph_f.c new/src/libscotch/library_graph_f.c
 *** src/src/libscotch/library_graph_f.c 2008-05-22 06:44:43.000000000 -0700
---- new/src/libscotch/library_graph_f.c 2010-02-10 11:23:26.630952069 -0800
+--- new/src/libscotch/library_graph_f.c 2010-03-03 14:06:15.336926237 -0800
 ***************
 *** 136,142 ****
@@ -1255 +1255 @@
 diff -rc src/src/libscotch/library_graph_map.c new/src/libscotch/library_graph_map.c
 *** src/src/libscotch/library_graph_map.c       2008-09-28 04:04:05.000000000 -0700
---- new/src/libscotch/library_graph_map.c       2010-02-10 11:23:26.635952075 -0800
+--- new/src/libscotch/library_graph_map.c       2010-03-03 14:06:15.343926240 -0800
 ***************
 *** 182,192 ****
@@ -1280 +1280 @@
 diff -rc src/src/libscotch/library_graph_map_f.c new/src/libscotch/library_graph_map_f.c
 *** src/src/libscotch/library_graph_map_f.c     2008-06-28 03:44:26.000000000 -0700
---- new/src/libscotch/library_graph_map_f.c     2010-02-10 11:23:26.642952083 -0800
+--- new/src/libscotch/library_graph_map_f.c     2010-03-03 14:06:15.349926242 -0800
 ***************
 *** 183,189 ****
@@ -1297 +1297 @@
 diff -rc src/src/libscotch/library.h new/src/libscotch/library.h
 *** src/src/libscotch/library.h 2009-05-09 16:08:03.000000000 -0700
---- new/src/libscotch/library.h 2010-02-10 11:23:26.648952090 -0800
+--- new/src/libscotch/library.h 2010-03-03 14:06:15.356926245 -0800
 ***************
 *** 134,140 ****
@@ -1342 +1342 @@
 diff -rc src/src/libscotch/Makefile new/src/libscotch/Makefile
 *** src/src/libscotch/Makefile  2009-05-09 16:08:04.000000000 -0700
---- new/src/libscotch/Makefile  2010-02-19 15:46:06.253243103 -0800
+--- new/src/libscotch/Makefile  2010-03-03 14:41:00.434722658 -0800
 ***************
 *** 49,55 ****
@@ -1362 +1362 @@
 ***************
 *** 68,73 ****
---- 68,81 ----
+--- 68,83 ----
                                         libptscotcherr$(LIB)                                                            \
                                         libptscotcherrexit$(LIB)
   
 + mexscotch                     :       clean
++                                       $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS)" SCOTCHLIB=scotch       \
++                                       dummysizes$(EXE)
 +                                       $(MAKE) CFLAGS="$(CFLAGS) -DMATLAB -I${MATLAB_DIR}/extern/include" CC="$(CCS)" CCD="$(CCS)" LDFLAGS="$(LDFLAGS) -Wl,-rpath-link,${MATLAB_DIR}/bin/glnxa64 -L${MATLAB_DIR}/bin/glnxa64 -lmex -lmat" SCOTCHLIB=scotch     \
 +                                       scotch.h                                                \
@@ -1379 +1381 @@
 diff -rc src/src/libscotch/mapping.h new/src/libscotch/mapping.h
 *** src/src/libscotch/mapping.h 2008-10-27 08:27:47.000000000 -0700
---- new/src/libscotch/mapping.h 2010-02-10 11:23:26.662952107 -0800
+--- new/src/libscotch/mapping.h 2010-03-03 14:06:15.371926251 -0800
 ***************
 *** 106,112 ****
@@ -1396 +1398 @@
 diff -rc src/src/libscotch/mapping_io.c new/src/libscotch/mapping_io.c
 *** src/src/libscotch/mapping_io.c      2008-05-22 06:44:43.000000000 -0700
---- new/src/libscotch/mapping_io.c      2010-02-10 11:23:26.667952113 -0800
+--- new/src/libscotch/mapping_io.c      2010-03-03 14:06:15.377926253 -0800
 ***************
 *** 199,204 ****
@@ -1485 +1487 @@
 diff -rc src/src/libscotch/mesh_io_scot.c new/src/libscotch/mesh_io_scot.c
 *** src/src/libscotch/mesh_io_scot.c    2008-05-22 06:44:43.000000000 -0700
---- new/src/libscotch/mesh_io_scot.c    2010-02-10 11:23:26.673952120 -0800
+--- new/src/libscotch/mesh_io_scot.c    2010-03-03 14:06:15.384926256 -0800
 ***************
 *** 85,91 ****
@@ -1502 +1504 @@
 diff -rc src/src/Makefile new/src/Makefile
 *** src/src/Makefile    2008-09-15 05:50:51.000000000 -0700
---- new/src/Makefile    2010-02-10 11:23:26.678952125 -0800
+--- new/src/Makefile    2010-03-03 14:06:15.389926258 -0800
 ***************
 *** 97,102 ****
@@ -1520 +1522 @@
 diff -rc src/src/scotch/Makefile new/src/scotch/Makefile
 *** src/src/scotch/Makefile     2009-04-27 02:19:43.000000000 -0700
---- new/src/scotch/Makefile     2010-02-19 15:47:58.973374370 -0800
+--- new/src/scotch/Makefile     2010-03-03 14:06:15.395926260 -0800
 ***************
 *** 49,59 ****

issm/trunk/externalpackages/scotch/scotch_jes_notes.txt

@@ -278 +278 @@
 2/08/10:
 
-- modified all changes to use the MATLAB compiler conditional, so that both mex and stand-alone modules could be built simultaneously
+- modified all source code changes to use the MATLAB compiler conditional, so that both mex and stand-alone modules could be built simultaneously
 
 2/10/10:
@@ -285 +285 @@
 - removed Matlab-specific switches from CFLAGS and LDFLAGS and added them to mexscotch target
 
+3/03/10:
+
+- separated dummysizes within mexscotch target in libscotch/Makefile so that it is built without the matlab flag, includes, and libraries (matlab 7.8 would fail even though matlab 7.6 was okay).
+