| blob | 3a2c21f1cf62a134f95ce445e387a95ba63404e8 |
1 --- misc/db-4.7.25.NC/dist/config.guess 2010-08-19 03:29:33.000000000 -0500
2 +++ misc/build/db-4.7.25.NC/dist/config.guess 2010-08-19 03:32:57.000000000 -0500
3 @@ -532,7 +532,7 @@
4 echo rs6000-ibm-aix3.2
5 fi
6 exit ;;
7 - *:AIX:*:[456])
8 + *:AIX:*:[4567])
9 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
10 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
11 IBM_ARCH=rs6000
12 @@ -544,6 +544,9 @@
13 else
14 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
15 fi
16 + if [ "$IBM_REV" == "V7BETA" ]; then
17 + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
18 + fi
19 echo ${IBM_ARCH}-ibm-aix${IBM_REV}
20 exit ;;
21 *:AIX:*:*)
22 --- misc/db-4.7.25.NC/dist/configure 2010-09-15 10:06:54.000000000 -0500
23 +++ misc/build/db-4.7.25.NC/dist/configure 2010-09-15 10:12:41.000000000 -0500
24 @@ -3701,7 +3701,7 @@
25 # Don't override anything if it's already set from the environment.
26 optimize_debug="-O"
27 case "$host_os" in
28 -aix4.3.*|aix5*)
29 +aix[4-9]*)
30 case "$host_os" in
31 aix4.3.*)
32 CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";;
33 @@ -6452,7 +6452,7 @@
34 # whether `pass_all' will *always* work, you probably want this one.
36 case $host_os in
37 -aix4* | aix5*)
38 +aix[4-9]*)
39 lt_cv_deplibs_check_method=pass_all
40 ;;
42 @@ -9439,7 +9439,7 @@
44 # See if GNU ld supports shared libraries.
45 case $host_os in
46 - aix3* | aix4* | aix5*)
47 + aix[4-9]*)
48 # On AIX/PPC, the GNU linker is very broken
49 if test "$host_cpu" != ia64; then
50 ld_shlibs=no
51 @@ -9649,7 +9649,7 @@
52 fi
53 ;;
55 - aix4* | aix5*)
56 + aix[4-9]*)
57 if test "$host_cpu" = ia64; then
58 # On IA64, the linker does run time linking by default, so we don't
59 # have to do anything special.
60 @@ -9669,7 +9669,7 @@
61 # Test if we are trying to use run time linking or normal
62 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
63 # need to do runtime linking.
64 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
65 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
66 for ld_flag in $LDFLAGS; do
67 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
68 aix_use_runtimelinking=yes
69 @@ -10410,7 +10410,7 @@
70 soname_spec='${libname}${release}${shared_ext}$major'
71 ;;
73 -aix4* | aix5*)
74 +aix[4-9]*)
75 version_type=linux
76 need_lib_prefix=no
77 need_version=no
78 @@ -11826,7 +11826,7 @@
79 fi
80 ;;
82 -aix4* | aix5*)
83 +aix[4-9]*)
84 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
85 test "$enable_shared" = yes && enable_static=no
86 fi
87 @@ -12670,7 +12670,7 @@
88 # FIXME: insert proper C++ library support
89 ld_shlibs_CXX=no
90 ;;
91 - aix4* | aix5*)
92 + aix[4-9]*)
93 if test "$host_cpu" = ia64; then
94 # On IA64, the linker does run time linking by default, so we don't
95 # have to do anything special.
96 @@ -12683,7 +12683,7 @@
97 # Test if we are trying to use run time linking or normal
98 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
99 # need to do runtime linking.
100 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
101 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
102 for ld_flag in $LDFLAGS; do
103 case $ld_flag in
104 *-brtl*)
105 @@ -13805,7 +13805,7 @@
106 esac
107 else
108 case $host_os in
109 - aix4* | aix5*)
110 + aix[4-9]*)
111 # All AIX code is PIC.
112 if test "$host_cpu" = ia64; then
113 # AIX 5 now supports IA64 processor
114 @@ -14201,7 +14201,7 @@
116 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
117 case $host_os in
118 - aix4* | aix5*)
119 + aix[4-9]*)
120 # If we're using GNU nm, then we don't want the "-C" option.
121 # -C means demangle to AIX nm, but means don't demangle with GNU nm
122 if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
123 @@ -14334,7 +14334,7 @@
124 soname_spec='${libname}${release}${shared_ext}$major'
125 ;;
127 -aix4* | aix5*)
128 +aix[4-9]*)
129 version_type=linux
130 need_lib_prefix=no
131 need_version=no
132 @@ -15455,7 +15455,7 @@
133 postinstall_cmds='$RANLIB $lib'
134 fi
135 ;;
136 -aix4* | aix5*)
137 +aix[4-9]*)
138 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
139 test "$enable_shared" = yes && enable_static=no
140 fi
141 @@ -15966,7 +15966,7 @@
143 # See if GNU ld supports shared libraries.
144 case $host_os in
145 - aix3* | aix4* | aix5*)
146 + aix[3-9]*)
147 # On AIX/PPC, the GNU linker is very broken
148 if test "$host_cpu" != ia64; then
149 ld_shlibs_F77=no
150 @@ -16176,7 +16176,7 @@
151 fi
152 ;;
154 - aix4* | aix5*)
155 + aix[4-9]*)
156 if test "$host_cpu" = ia64; then
157 # On IA64, the linker does run time linking by default, so we don't
158 # have to do anything special.
159 @@ -16917,7 +16917,7 @@
160 soname_spec='${libname}${release}${shared_ext}$major'
161 ;;
163 -aix4* | aix5*)
164 +aix[4-9]*)
165 version_type=linux
166 need_lib_prefix=no
167 need_version=no
168 @@ -18540,7 +18540,7 @@
170 # See if GNU ld supports shared libraries.
171 case $host_os in
172 - aix3* | aix4* | aix5*)
173 + aix[3-9]*)
174 # On AIX/PPC, the GNU linker is very broken
175 if test "$host_cpu" != ia64; then
176 ld_shlibs_GCJ=no
177 @@ -18750,7 +18750,7 @@
178 fi
179 ;;
181 - aix4* | aix5*)
182 + aix[4-9]*)
183 if test "$host_cpu" = ia64; then
184 # On IA64, the linker does run time linking by default, so we don't
185 # have to do anything special.
186 @@ -19511,7 +19511,7 @@
187 soname_spec='${libname}${release}${shared_ext}$major'
188 ;;
190 -aix4* | aix5*)
191 +aix[4-9]*)
192 version_type=linux
193 need_lib_prefix=no
194 need_version=no
195 --- misc/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:06:54.000000000 -0500
196 +++ misc/build/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:08:45.000000000 -0500
197 @@ -154,7 +154,7 @@
198 # Don't override anything if it's already set from the environment.
199 optimize_debug="-O"
200 case "$host_os" in
201 -aix4.3.*|aix5*)
202 +aix[4-9]*)
203 case "$host_os" in
204 aix4.3.*)
205 CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";;