source: issm/oecreview/Archive/11381-11400/ISSM-11396-11397.diff

Last change on this file was 11515, checked in by Eric.Larour, 13 years ago

Oecreview up to 11509
File size: 2.1 KB
RevLine 
[11515]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh (revision 11396)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh (revision 11397)
5@@ -14,7 +14,8 @@
6 #Apply patches
7 cd install
8 patch -p1 < ../metis-4.0.patch
9-patch Makefile.in ../configs/4.0/win7/Makefile.in.patch
10+patch -R Lib/Makefile ../configs/4.0/win7/Makefile.patch
11+patch -R Makefile.in ../configs/4.0/win7/Makefile.in.patch
12
13 #Compile
14 make
15Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch
16===================================================================
17--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch (revision 11396)
18+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch (revision 11397)
19@@ -1,14 +1,25 @@
20 3,5c3,5
21-< CC = gcc
22-< OBJ_EXT=o
23-< LIB_EXT=a
24+< CC = cl
25+< OBJ_EXT=obj
26+< LIB_EXT=lib
27 ---
28-> CC = cl
29-> OBJ_EXT=obj
30-> LIB_EXT=lib
31+> CC = gcc
32+> OBJ_EXT=o
33+> LIB_EXT=a
34 8c8
35-< OPTFLAGS = -DLINUX -fPIC
36+< OPTFLAGS = -DWIN32 -D__VC__
37 ---
38-> OPTFLAGS = -DWIN32 -D__VC__
39-22d21
40-< #RANLIB =
41+> OPTFLAGS = -DLINUX -fPIC
42+16,17c16,24
43+< # What tool to use to create library
44+< LIB=lib.exe
45+---
46+> # What archiving to use
47+> AR = ar rv
48+>
49+> # What to use for indexing the archive
50+> RANLIB = ranlib
51+> #RANLIB = ar -ts
52+> #RANLIB =
53+>
54+>
55Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch
56===================================================================
57--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch (revision 0)
58+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch (revision 11397)
59@@ -0,0 +1,5 @@
60+24c24,25
61+< $(LIB) -out:$@ $(OBJS)
62+---
63+> $(AR) $@ $(OBJS)
64+> $(RANLIB) $@
Note: See TracBrowser for help on using the repository browser.