]>
Commit | Line | Data |
---|---|---|
98765fbd JB |
1 | --- hdf5-1.6.0/config/commence.in.orig 2003-07-03 19:23:35.000000000 +0200 |
2 | +++ hdf5-1.6.0/config/commence.in 2003-07-19 14:00:59.000000000 +0200 | |
3 | @@ -51,7 +51,7 @@ | |
4 | LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(libdir) $(DYNAMIC_DIRS) | |
5 | LT_RUN=$(LT) --mode=execute | |
6 | LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) | |
7 | -LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) | |
8 | +LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_PROGRAM) | |
9 | LT_UNINSTALL=$(LT) --mode=uninstall $(RM) | |
10 | ||
11 | ## Optional variables. We must declare them here because Irix pmake | |
12 | --- hdf5-1.6.0/c++/config/commence.in.orig 2003-06-30 17:19:35.000000000 +0200 | |
13 | +++ hdf5-1.6.0/c++/config/commence.in 2003-07-19 14:01:16.000000000 +0200 | |
14 | @@ -50,11 +50,11 @@ | |
699014da JB |
15 | DYNAMIC_DIRS=@DYNAMIC_DIRS@ |
16 | LT=$(top_builddir)/libtool | |
17 | LT_COMPILE=$(LT) --mode=compile $(CXX) | |
18 | -LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS) | |
98765fbd | 19 | -LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS) |
699014da | 20 | +LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir) $(DYNAMIC_DIRS) |
79cc6a5d | 21 | +LT_LINK_EXE=$(LT) --mode=link $(CXX) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS) |
699014da JB |
22 | LT_RUN=$(LT) --mode=execute |
23 | LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) | |
98765fbd JB |
24 | -LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) |
25 | +LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_PROGRAM) | |
26 | LT_UNINSTALL=$(LT) --mode=uninstall $(RM) | |
27 | ||
28 | ## Optional variables. We must declare them here because Irix pmake | |
7689668b JB |
29 | --- hdf5-1.6.5/config/gnu-flags.orig 2005-10-28 22:15:26.000000000 +0200 |
30 | +++ hdf5-1.6.5/config/gnu-flags 2005-11-15 18:20:35.303439288 +0100 | |
31 | @@ -107,26 +107,6 @@ | |
b9650a3d JB |
32 | gcc*|egcs*|pgcc*) |
33 | # Architecture-specific flags | |
34 | arch= | |
35 | - case "$host_os-$host_cpu" in | |
36 | - # FreeBSD sets the information from "uname -m" to the general machine | |
37 | - # architecture, not the specific CPU for the machine, so even our | |
38 | - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD | |
39 | - # machine, use the "sysctl" command to get the CPU hardware model. | |
40 | - freebsd*-i386) | |
41 | - host_cpu_model=`sysctl -n hw.model` | |
42 | - case "$host_cpu_model" in | |
43 | - # Hmm.. this might not catch Celerons, but it won't hurt them either... | |
44 | - *Pro*|*II*|*III*|*IV*|*Athlon*) | |
45 | - arch="-march=i686" | |
46 | - ;; | |
47 | - esac | |
79cc6a5d | 48 | - ;; |
79cc6a5d | 49 | - |
b9650a3d JB |
50 | - *-i686) |
51 | - arch="-march=i686" | |
52 | - ;; | |
53 | - esac | |
79cc6a5d | 54 | - |
b9650a3d JB |
55 | # Host-specific flags |
56 | case "`hostname`" in | |
57 | sleipnir.ncsa.uiuc.edu) | |
7689668b | 58 | @@ -140,7 +120,6 @@ |
f9aea359 JB |
59 | # Production |
60 | case "$cc_vendor-$cc_version" in | |
61 | gcc-2.95.[34]) | |
b9650a3d | 62 | - PROD_CFLAGS="-O3" |
f9aea359 | 63 | ;; |
7689668b | 64 | gcc-3.[0-4]*|gcc-4.[01]*) |
b9650a3d | 65 | # The optimization level is reduced for gcc 3.* and 4.* due to problems |
7689668b | 66 | @@ -148,14 +127,11 @@ |
b9650a3d JB |
67 | # optimization levels (which shows up as failures for various integer |
68 | # types -> long long conversions in the test/dtypes test). Perhaps | |
69 | # later versions of gcc will fix this bug... - QAK - 2003/10/20 | |
70 | - PROD_CFLAGS="-O" | |
f9aea359 | 71 | ;; |
b9650a3d | 72 | gcc-4*) |
f9aea359 | 73 | # Be optimistic about future versions of gcc.. :-) - QAK - 2003/10/20 |
b9650a3d | 74 | - PROD_CFLAGS="-O3" |
f9aea359 JB |
75 | ;; |
76 | *) | |
b9650a3d | 77 | - PROD_CFLAGS="-O" |
f9aea359 JB |
78 | ;; |
79 | esac | |
80 | ||
7689668b | 81 | @@ -192,7 +168,7 @@ |
f9aea359 JB |
82 | CFLAGS="$CFLAGS -Wno-long-long" |
83 | ||
84 | # Append warning flags from gcc-3* case | |
7689668b JB |
85 | - DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded" |
86 | + DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute" | |
f9aea359 JB |
87 | |
88 | # Append warning flags from gcc-3.2* case | |
7689668b JB |
89 | DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar" |
90 | @@ -225,7 +201,7 @@ | |
f9aea359 | 91 | CFLAGS="$CFLAGS -Wno-long-long" |
0802df2e | 92 | |
f9aea359 | 93 | # Append warning flags from gcc-3* case |
7689668b JB |
94 | - DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded" |
95 | + DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute" | |
0802df2e | 96 | |
f9aea359 | 97 | # Append warning flags from gcc-3.2* case |
7689668b JB |
98 | DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar" |
99 | @@ -255,7 +231,7 @@ | |
f9aea359 | 100 | CFLAGS="$CFLAGS -Wno-long-long" |
0802df2e | 101 | |
f9aea359 | 102 | # Append warning flags from gcc-3* case |
7689668b JB |
103 | - DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded" |
104 | + DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute" | |
0802df2e | 105 | |
b9650a3d | 106 | # Append warning flags from gcc-3.2* case |
7689668b JB |
107 | DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar" |
108 | @@ -279,7 +255,7 @@ | |
f9aea359 | 109 | CFLAGS="$CFLAGS -Wno-long-long" |
0802df2e | 110 | |
b9650a3d | 111 | # Append warning flags from gcc-3* case |
7689668b JB |
112 | - DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded" |
113 | + DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute" | |
0802df2e | 114 | |
b9650a3d | 115 | # Append more extra warning flags that only gcc3.2+ know about |
7689668b JB |
116 | DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar" |
117 | @@ -300,7 +276,7 @@ | |
118 | CFLAGS="$CFLAGS -Wno-long-long" | |
119 | ||
120 | # Append some extra warning flags that only gcc3+ know about | |
121 | - DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded" | |
122 | + DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute" | |
123 | ;; | |
124 | ||
125 | gcc-2.9[56]*) |