]>
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 | |
29 | --- hdf5-1.6.0/config/gnu-flags.orig Sat May 11 00:22:18 2002 | |
30 | +++ hdf5-1.6.0/config/gnu-flags Sat Oct 5 15:25:14 2002 | |
31 | @@ -75,27 +75,6 @@ | |
79cc6a5d JB |
32 | sleep 5 |
33 | fi | |
34 | ||
35 | -# Architecture-specific flags | |
36 | -case "$host_os-$host_cpu" in | |
37 | - # FreeBSD sets the information from "hostname -m" to the general machine | |
38 | - # architecture, not the specific CPU for the machine, so even our | |
39 | - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD | |
40 | - # machine, use the "sysctl" command to get the CPU hardware model. | |
41 | - freebsd*) | |
42 | - host_cpu_model=`sysctl -n hw.model` | |
43 | - case "$host_cpu_model" in | |
44 | - # Hmm.. this might not catch Celerons, but it won't hurt them either... | |
98765fbd JB |
45 | - *Pro*|*II*|*III*|*IV*|*Athlon*) |
46 | - ARCH=${ARCH:="-march=i686"} | |
79cc6a5d JB |
47 | - ;; |
48 | - esac | |
49 | - ;; | |
50 | - | |
51 | - *-i686) | |
98765fbd | 52 | - ARCH=${ARCH:="-march=i686"} |
79cc6a5d JB |
53 | - ;; |
54 | -esac | |
55 | - | |
56 | # Host-specific flags | |
57 | case "`hostname`" in | |
58 | sleipnir.ncsa.uiuc.edu) | |
98765fbd JB |
59 | @@ -97,10 +97,10 @@ |
60 | # Production | |
61 | case "$cc_vendor-$cc_version" in | |
62 | gcc-2.95.[34]|gcc-3*) | |
63 | - PROD_CFLAGS="-O3 $NOFP" | |
64 | + PROD_CFLAGS="$NOFP" | |
65 | ;; | |
66 | *) | |
67 | - PROD_CFLAGS="-O $NOFP -finline-functions" | |
68 | + PROD_CFLAGS="$NOFP -finline-functions" | |
69 | ;; | |
70 | esac | |
71 | PROD_CPPFLAGS= |