]>
Commit | Line | Data |
---|---|---|
699014da JB |
1 | --- hdf5-1.4.2/c++/config/commence.in.orig Thu Apr 12 21:42:26 2001 |
2 | +++ hdf5-1.4.2/c++/config/commence.in Mon Oct 15 12:30:53 2001 | |
3 | @@ -44,7 +44,7 @@ | |
4 | DYNAMIC_DIRS=@DYNAMIC_DIRS@ | |
5 | LT=$(top_builddir)/libtool | |
6 | LT_COMPILE=$(LT) --mode=compile $(CXX) | |
7 | -LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS) | |
79cc6a5d | 8 | -LT_LINK_EXE=$(LT) --mode=link $(CXX) $(LT_STATIC_EXEC) -dlopen self -static -rpath $(bindir) $(DYNAMIC_DIRS) |
699014da | 9 | +LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir) $(DYNAMIC_DIRS) |
79cc6a5d | 10 | +LT_LINK_EXE=$(LT) --mode=link $(CXX) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS) |
699014da JB |
11 | LT_RUN=$(LT) --mode=execute |
12 | LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) | |
79cc6a5d JB |
13 | --- hdf5-1.4.4/config/gnu-flags.orig Sat May 11 00:22:18 2002 |
14 | +++ hdf5-1.4.4/config/gnu-flags Sat Oct 5 15:25:14 2002 | |
15 | @@ -75,42 +75,6 @@ | |
16 | sleep 5 | |
17 | fi | |
18 | ||
19 | -# Architecture-specific flags | |
20 | -case "$host_os-$host_cpu" in | |
21 | - # FreeBSD sets the information from "hostname -m" to the general machine | |
22 | - # architecture, not the specific CPU for the machine, so even our | |
23 | - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD | |
24 | - # machine, use the "sysctl" command to get the CPU hardware model. | |
25 | - freebsd*) | |
26 | - host_cpu_model=`sysctl -n hw.model` | |
27 | - case "$host_cpu_model" in | |
28 | - # Hmm.. this might not catch Celerons, but it won't hurt them either... | |
29 | - *Pro*|*II*) | |
30 | - # This check should be kept in sync with the *-i686 check below | |
31 | - case "$cc_vendor-$cc_version" in | |
32 | - gcc-2.95*|gcc-3*) | |
33 | - ARCH=${ARCH:="-march=i686"} | |
34 | - ;; | |
35 | - gcc-*|egcs-*|pgcc-*) | |
36 | - ARCH=${ARCH:="-mcpu=pentiumpro -march=pentiumpro"} | |
37 | - ;; | |
38 | - esac | |
39 | - ;; | |
40 | - esac | |
41 | - ;; | |
42 | - | |
43 | - *-i686) | |
44 | - case "$cc_vendor-$cc_version" in | |
45 | - gcc-2.9[56]*|gcc-3*) | |
46 | - ARCH=${ARCH:="-march=i686"} | |
47 | - ;; | |
48 | - gcc-*|egcs-*|pgcc-*) | |
49 | - ARCH=${ARCH:="-mcpu=pentiumpro -march=pentiumpro"} | |
50 | - ;; | |
51 | - esac | |
52 | - ;; | |
53 | -esac | |
54 | - | |
55 | # Host-specific flags | |
56 | case "`hostname`" in | |
57 | sleipnir.ncsa.uiuc.edu) | |
58 | @@ -144,7 +144,7 @@ | |
59 | cc_flags_set=yes | |
60 | ;; | |
61 | ||
62 | - gcc-3.1*) | |
63 | + gcc-3.[12]*) | |
64 | # Replace -ansi flag with -std=c99 flag | |
65 | CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`" | |
66 |