Wed Mar 23 15:46:36 2011 UTC ()
Backport Haiku support, taken from upstream.
(I'm using this patch over 10 months).


(obache)
diff -r1.80 -r1.81 pkgsrc/devel/libtool/distinfo
diff -r1.30 -r1.31 pkgsrc/devel/libtool/patches/manual-libtool.m4
diff -r1.68 -r1.69 pkgsrc/devel/libtool/patches/patch-ab
diff -r1.24 -r1.25 pkgsrc/devel/libtool/patches/patch-ac
diff -r1.37 -r1.38 pkgsrc/devel/libtool/patches/patch-ad
cvs diff -r1.80 -r1.81 pkgsrc/devel/libtool/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libtool/distinfo 2010/03/17 10:59:44 1.80
+++ pkgsrc/devel/libtool/distinfo 2011/03/23 15:46:36 1.81
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.80 2010/03/17 10:59:44 markd Exp $ 1$NetBSD: distinfo,v 1.81 2011/03/23 15:46:36 obache Exp $
2 2
3SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55 3SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55
4RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef 4RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef
5Size (libtool-2.2.6b.tar.gz) = 2347317 bytes 5Size (libtool-2.2.6b.tar.gz) = 2347317 bytes
6SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751 6SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751
7SHA1 (patch-ab) = 39bce4c6a4bcfb9f6e20c06742e2a9897f40cac8 7SHA1 (patch-ab) = 5944c9a00a964c08e37734af177763f81fa15fb8
8SHA1 (patch-ac) = 8187bfc8436d2d7477a6a33c925c6d141804ad65 8SHA1 (patch-ac) = 95e9aed6036cd98075af6fed4a53ecdd58e1e84c
9SHA1 (patch-ad) = 51ede8bef293d566cd359efa52e6cd04f4a380ec 9SHA1 (patch-ad) = b2a60570d0eec011adc4a662249fd22975487d86
cvs diff -r1.30 -r1.31 pkgsrc/devel/libtool/patches/manual-libtool.m4 (expand / switch to unified diff)

--- pkgsrc/devel/libtool/patches/manual-libtool.m4 2010/03/17 10:59:45 1.30
+++ pkgsrc/devel/libtool/patches/manual-libtool.m4 2011/03/23 15:46:36 1.31
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $ 1$NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
2 2
3--- libltdl/m4/libtool.m4.orig 2008-09-05 13:54:41.000000000 +0200 3--- libltdl/m4/libtool.m4.orig 2009-11-16 13:11:59.000000000 +0000
4+++ libltdl/m4/libtool.m4 4+++ libltdl/m4/libtool.m4
5@@ -118,7 +118,10 @@ m4_defun([_LT_CC_BASENAME], 5@@ -118,7 +118,10 @@ m4_defun([_LT_CC_BASENAME],
6 *) break;; 6 *) break;;
7 esac 7 esac
8 done 8 done
9-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 9-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
10+# Return the actual command name, not our pkgsrc wrapper name because several 10+# Return the actual command name, not our pkgsrc wrapper name because several
11+# decisions are made only based on compiler names 11+# decisions are made only based on compiler names
12+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi 12+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
13+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 13+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
14 ]) 14 ])
15  15
16  16
@@ -72,180 +72,260 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/0 @@ -72,180 +72,260 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/0
72+ version_type=linux 72+ version_type=linux
73+ need_version=no 73+ need_version=no
74+ need_lib_prefix=no 74+ need_lib_prefix=no
75+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 75+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
76+ soname_spec='${libname}${release}${shared_ext}$major' 76+ soname_spec='${libname}${release}${shared_ext}$major'
77+ shlibpath_var=LD_LIBRARY_PATH 77+ shlibpath_var=LD_LIBRARY_PATH
78+ shlibpath_overrides_runpath=no 78+ shlibpath_overrides_runpath=no
79+ hardcode_into_libs=yes 79+ hardcode_into_libs=yes
80+ ;; 80+ ;;
81+ 81+
82 gnu*) 82 gnu*)
83 version_type=linux 83 version_type=linux
84 need_lib_prefix=no 84 need_lib_prefix=no
85@@ -2405,12 +2425,7 @@ interix[[3-9]]*) 85@@ -2344,6 +2364,19 @@ gnu*)
 86 hardcode_into_libs=yes
 87 ;;
 88
 89+haiku*)
 90+ version_type=linux
 91+ need_lib_prefix=no
 92+ need_version=no
 93+ dynamic_linker="$host_os runtime_loader"
 94+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 95+ soname_spec='${libname}${release}${shared_ext}$major'
 96+ shlibpath_var=LIBRARY_PATH
 97+ shlibpath_overrides_runpath=yes
 98+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 99+ hardcode_into_libs=yes
 100+ ;;
 101+
 102 hpux9* | hpux10* | hpux11*)
 103 # Give a soname corresponding to the major version so that dld.sl refuses to
 104 # link against other versions.
 105@@ -2405,12 +2438,7 @@ interix[[3-9]]*)
86 irix5* | irix6* | nonstopux*) 106 irix5* | irix6* | nonstopux*)
87 case $host_os in 107 case $host_os in
88 nonstopux*) version_type=nonstopux ;; 108 nonstopux*) version_type=nonstopux ;;
89- *) 109- *)
90- if test "$lt_cv_prog_gnu_ld" = yes; then 110- if test "$lt_cv_prog_gnu_ld" = yes; then
91- version_type=linux 111- version_type=linux
92- else 112- else
93- version_type=irix 113- version_type=irix
94- fi ;; 114- fi ;;
95+ *) version_type=irix ;; 115+ *) version_type=irix ;;
96 esac 116 esac
97 need_lib_prefix=no 117 need_lib_prefix=no
98 need_version=no 118 need_version=no
99@@ -2486,15 +2501,14 @@ linux* | k*bsd*-gnu) 119@@ -2486,15 +2514,14 @@ linux* | k*bsd*-gnu)
100 ;; 120 ;;
101  121
102 netbsd*) 122 netbsd*)
103- version_type=sunos 123- version_type=sunos
104+ version_type=linux 124+ version_type=linux
105 need_lib_prefix=no 125 need_lib_prefix=no
106 need_version=no 126 need_version=no
107- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 127- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
108- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 128- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
109+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 129+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
110+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then 130+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
111 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 131 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
112 dynamic_linker='NetBSD (a.out) ld.so' 132 dynamic_linker='NetBSD (a.out) ld.so'
113 else 133 else
114- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 134- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
115 soname_spec='${libname}${release}${shared_ext}$major' 135 soname_spec='${libname}${release}${shared_ext}$major'
116 dynamic_linker='NetBSD ld.elf_so' 136 dynamic_linker='NetBSD ld.elf_so'
117 fi 137 fi
118@@ -2523,7 +2537,7 @@ newsos6) 138@@ -2523,7 +2550,7 @@ newsos6)
119 ;; 139 ;;
120  140
121 openbsd*) 141 openbsd*)
122- version_type=sunos 142- version_type=sunos
123+ version_type=linux 143+ version_type=linux
124 sys_lib_dlsearch_path_spec="/usr/lib" 144 sys_lib_dlsearch_path_spec="/usr/lib"
125 need_lib_prefix=no 145 need_lib_prefix=no
126 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. 146 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
127@@ -2531,7 +2545,7 @@ openbsd*) 147@@ -2531,7 +2558,7 @@ openbsd*)
128 openbsd3.3 | openbsd3.3.*) need_version=yes ;; 148 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
129 *) need_version=no ;; 149 *) need_version=no ;;
130 esac 150 esac
131- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 151- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
132+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 152+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
133 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 153 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
134 shlibpath_var=LD_LIBRARY_PATH 154 shlibpath_var=LD_LIBRARY_PATH
135 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 155 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
136@@ -3091,7 +3105,7 @@ newos6*) 156@@ -3038,6 +3065,10 @@ gnu*)
 157 lt_cv_deplibs_check_method=pass_all
 158 ;;
 159
 160+haiku*)
 161+ lt_cv_deplibs_check_method=pass_all
 162+ ;;
 163+
 164 hpux10.20* | hpux11*)
 165 lt_cv_file_magic_cmd=/usr/bin/file
 166 case $host_cpu in
 167@@ -3091,7 +3122,7 @@ newos6*)
137 ;; 168 ;;
138  169
139 *nto* | *qnx*) 170 *nto* | *qnx*)
140- lt_cv_deplibs_check_method=pass_all 171- lt_cv_deplibs_check_method=pass_all
141+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|S\.a)$' 172+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|S\.a)$'
142 ;; 173 ;;
143  174
144 openbsd*) 175 openbsd*)
145@@ -3580,9 +3594,15 @@ m4_if([$1], [CXX], [ 176@@ -3256,7 +3287,7 @@ AC_DEFUN([LT_LIB_M],
 177 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 178 LIBM=
 179 case $host in
 180-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
 181+*-*-beos* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
 182 # These system don't have libm, or don't need it
 183 ;;
 184 *-ncr-sysv4.3*)
 185@@ -3580,14 +3611,25 @@ m4_if([$1], [CXX], [
146 [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) 186 [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
147 ;; 187 ;;
148 darwin* | rhapsody*) 188 darwin* | rhapsody*)
149- # PIC is the default on this platform 189- # PIC is the default on this platform
150+ # PIC is the default on this platform, and static linking of 190+ # PIC is the default on this platform, and static linking of
151+ # binaries generally doesn't work 191+ # binaries generally doesn't work
152 # Common symbols not allowed in MH_DYLIB files 192 # Common symbols not allowed in MH_DYLIB files
153 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' 193 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
154+ _LT_TAGVAR(lt_prog_compiler_static, $1)='' 194+ _LT_TAGVAR(lt_prog_compiler_static, $1)=''
155+ ;; 195+ ;;
156+ *mint*) 196+ *mint*)
157+ # FreeMiNT does not support shared libraries at all 197+ # FreeMiNT does not support shared libraries at all
158+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= 198+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
159 ;; 199 ;;
160 *djgpp*) 200 *djgpp*)
161 # DJGPP does not support shared libraries at all 201 # DJGPP does not support shared libraries at all
162@@ -3650,6 +3670,9 @@ m4_if([$1], [CXX], [ 202 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 203 ;;
 204+ haiku*)
 205+ # PIC is the default for Haiku.
 206+ # The "-static" flag exists, but is broken.
 207+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
 208+ ;;
 209 interix[[3-9]]*)
 210 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 211 # Instead, we relocate shared libraries at runtime.
 212@@ -3650,6 +3692,9 @@ m4_if([$1], [CXX], [
163 ;; 213 ;;
164 esac 214 esac
165 ;; 215 ;;
166+ mint*) 216+ mint*)
167+ # FreeMiNT uses GNU C++ 217+ # FreeMiNT uses GNU C++
168+ ;; 218+ ;;
169 freebsd* | dragonfly*) 219 freebsd* | dragonfly*)
170 # FreeBSD uses GNU C++ 220 # FreeBSD uses GNU C++
171 ;; 221 ;;
172@@ -3888,9 +3911,11 @@ m4_if([$1], [CXX], [ 222@@ -3888,9 +3933,17 @@ m4_if([$1], [CXX], [
173 ;; 223 ;;
174  224
175 darwin* | rhapsody*) 225 darwin* | rhapsody*)
176- # PIC is the default on this platform 226- # PIC is the default on this platform
177+ # PIC is the default on this platform, and static linking of 227+ # PIC is the default on this platform, and static linking of
178+ # binaries generally doesn't work 228+ # binaries generally doesn't work
179 # Common symbols not allowed in MH_DYLIB files 229 # Common symbols not allowed in MH_DYLIB files
180 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' 230 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
181+ _LT_TAGVAR(lt_prog_compiler_static, $1)='' 231+ _LT_TAGVAR(lt_prog_compiler_static, $1)=''
 232+ ;;
 233+
 234+ haiku*)
 235+ # PIC is the default for Haiku.
 236+ # The "-static" flag exists, but is broken.
 237+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
182 ;; 238 ;;
183  239
184 hpux*) 240 hpux*)
185@@ -3912,6 +3937,13 @@ m4_if([$1], [CXX], [ 241@@ -3912,6 +3965,13 @@ m4_if([$1], [CXX], [
186 # Instead, we relocate shared libraries at runtime. 242 # Instead, we relocate shared libraries at runtime.
187 ;; 243 ;;
188  244
189+ mint*) 245+ mint*)
190+ # Just because we use GCC doesn't mean we suddenly get shared libraries 246+ # Just because we use GCC doesn't mean we suddenly get shared libraries
191+ # on systems that don't support them. 247+ # on systems that don't support them.
192+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no 248+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
193+ enable_shared=no 249+ enable_shared=no
194+ ;; 250+ ;;
195+ 251+
196 msdosdjgpp*) 252 msdosdjgpp*)
197 # Just because we use GCC doesn't mean we suddenly get shared libraries 253 # Just because we use GCC doesn't mean we suddenly get shared libraries
198 # on systems that don't support them. 254 # on systems that don't support them.
199@@ -4110,6 +4142,9 @@ m4_if([$1], [CXX], [ 255@@ -4110,6 +4170,9 @@ m4_if([$1], [CXX], [
200 ]) 256 ])
201 case $host_os in 257 case $host_os in
202 # For platforms which do not support PIC, -DPIC is meaningless: 258 # For platforms which do not support PIC, -DPIC is meaningless:
203+ mint*) 259+ mint*)
204+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= 260+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
205+ ;; 261+ ;;
206 *djgpp*) 262 *djgpp*)
207 _LT_TAGVAR(lt_prog_compiler_pic, $1)= 263 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
208 ;; 264 ;;
209@@ -4429,7 +4464,7 @@ _LT_EOF 265@@ -4343,6 +4406,11 @@ _LT_EOF
 266 fi
 267 ;;
 268
 269+ haiku*)
 270+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 271+ _LT_TAGVAR(link_all_deplibs, $1)=yes
 272+ ;;
 273+
 274 interix[[3-9]]*)
 275 _LT_TAGVAR(hardcode_direct, $1)=no
 276 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 277@@ -4429,7 +4497,7 @@ _LT_EOF
210 ;; 278 ;;
211  279
212 netbsd*) 280 netbsd*)
213- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 281- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
214+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then 282+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
215 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 283 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
216 wlarc= 284 wlarc=
217 else 285 else
218@@ -4861,6 +4896,8 @@ _LT_EOF 286@@ -4861,6 +4929,8 @@ _LT_EOF
219 ;; 287 ;;
220  288
221 *nto* | *qnx*) 289 *nto* | *qnx*)
222+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 290+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
223+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 291+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
224 ;; 292 ;;
225  293
226 openbsd*) 294 openbsd*)
227@@ -5318,9 +5355,7 @@ m4_defun([_LT_PROG_CXX], 295@@ -5318,9 +5388,7 @@ m4_defun([_LT_PROG_CXX],
228 [ 296 [
229 pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) 297 pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
230 AC_PROG_CXX 298 AC_PROG_CXX
231-if test -n "$CXX" && ( test "X$CXX" != "Xno" && 299-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
232- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 300- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
233- (test "X$CXX" != "Xg++"))) ; then 301- (test "X$CXX" != "Xg++"))) ; then
234+if test -n "$CXX" && test "X$CXX" != "Xno" ; then 302+if test -n "$CXX" && test "X$CXX" != "Xno" ; then
235 AC_PROG_CXXCPP 303 AC_PROG_CXXCPP
236 else 304 else
237 _lt_caught_CXX_error=yes 305 _lt_caught_CXX_error=yes
238@@ -6008,18 +6043,37 @@ if test "$_lt_caught_CXX_error" != yes;  306@@ -5685,6 +5753,11 @@ if test "$_lt_caught_CXX_error" != yes;
 307 gnu*)
 308 ;;
 309
 310+ haiku*)
 311+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 312+ _LT_TAGVAR(link_all_deplibs, $1)=yes
 313+ ;;
 314+
 315 hpux9*)
 316 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 317 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 318@@ -6008,18 +6081,37 @@ if test "$_lt_caught_CXX_error" != yes;
239  319
240 netbsd*) 320 netbsd*)
241 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 321 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
242+ # a.out is quite broken and goes directly to ld 322+ # a.out is quite broken and goes directly to ld
243 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' 323 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
244 wlarc= 324 wlarc=
245+ # Determine if we need to override the c++rt0 that is 325+ # Determine if we need to override the c++rt0 that is
246+ # picked up by analysing output_verbose_link_cmds 326+ # picked up by analysing output_verbose_link_cmds
247+ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then 327+ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
248+ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC" 328+ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
249+ else 329+ else
250+ cpprt0_file= 330+ cpprt0_file=
251+ fi 331+ fi
@@ -267,25 +347,25 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/0 @@ -267,25 +347,25 @@ $NetBSD: manual-libtool.m4,v 1.30 2010/0
267 ;; 347 ;;
268  348
269 *nto* | *qnx*) 349 *nto* | *qnx*)
270- _LT_TAGVAR(ld_shlibs, $1)=yes 350- _LT_TAGVAR(ld_shlibs, $1)=yes
271+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 351+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
272+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 352+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
273+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' 353+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
274+ _LT_TAGVAR(hardcode_direct, $1)=yes 354+ _LT_TAGVAR(hardcode_direct, $1)=yes
275+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 355+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
276+ output_verbose_link_cmd='echo' 356+ output_verbose_link_cmd='echo'
277 ;; 357 ;;
278  358
279 openbsd2*) 359 openbsd2*)
280@@ -6481,6 +6535,11 @@ $RM -f confest.$objext 360@@ -6481,6 +6573,11 @@ $RM -f confest.$objext
281 # PORTME: override above test on systems where it is broken 361 # PORTME: override above test on systems where it is broken
282 m4_if([$1], [CXX], 362 m4_if([$1], [CXX],
283 [case $host_os in 363 [case $host_os in
284+netbsd*) 364+netbsd*)
285+ if test -n "$cpprt0_file"; then 365+ if test -n "$cpprt0_file"; then
286+ _LT_TAGVAR(predep_objects,$1)=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` 366+ _LT_TAGVAR(predep_objects,$1)=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
287+ fi 367+ fi
288+ ;; 368+ ;;
289 interix[[3-9]]*) 369 interix[[3-9]]*)
290 # Interix 3.5 installs completely hosed .la files for C++, so rather than 370 # Interix 3.5 installs completely hosed .la files for C++, so rather than
291 # hack all around it, let's just trust "g++" to DTRT. 371 # hack all around it, let's just trust "g++" to DTRT.
cvs diff -r1.68 -r1.69 pkgsrc/devel/libtool/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/libtool/patches/Attic/patch-ab 2010/03/17 10:59:45 1.68
+++ pkgsrc/devel/libtool/patches/Attic/patch-ab 2011/03/23 15:46:36 1.69
@@ -1,239 +1,300 @@ @@ -1,239 +1,300 @@
1$NetBSD: patch-ab,v 1.68 2010/03/17 10:59:45 markd Exp $ 1$NetBSD: patch-ab,v 1.69 2011/03/23 15:46:36 obache Exp $
2 2
3The last two chunks work around bugs in ksh on NetBSD. 3The last two chunks work around bugs in ksh on NetBSD.
4The problem manifests with wl and no_builtin_flag containing newlines. 4The problem manifests with wl and no_builtin_flag containing newlines.
5 5
6--- configure.orig 2009-11-16 13:14:55.000000000 +0000 6--- configure.orig 2010-06-19 07:24:20.000000000 +0000
7+++ configure 7+++ configure
8@@ -5293,6 +5293,13 @@ else 8@@ -5293,6 +5293,13 @@ else
9 lt_cv_sys_max_cmd_len=8192; 9 lt_cv_sys_max_cmd_len=8192;
10 ;; 10 ;;
11  11
12+ mint*) 12+ mint*)
13+ # On MiNT we can support fairly large cmd lengths, but it takes 13+ # On MiNT we can support fairly large cmd lengths, but it takes
14+ # a while to run the tests, so let's restrict it to something 14+ # a while to run the tests, so let's restrict it to something
15+ # reasonable. 15+ # reasonable.
16+ lt_cv_sys_max_cmd_len=8192; 16+ lt_cv_sys_max_cmd_len=8192;
17+ ;; 17+ ;;
18+ 18+
19 amigaos*) 19 amigaos*)
20 # On AmigaOS with pdksh, this test takes hours, literally. 20 # On AmigaOS with pdksh, this test takes hours, literally.
21 # So we just punt and use a minimum line length of 8192. 21 # So we just punt and use a minimum line length of 8192.
22@@ -5718,7 +5725,7 @@ newos6*) 22@@ -5665,6 +5672,10 @@ gnu*)
 23 lt_cv_deplibs_check_method=pass_all
 24 ;;
 25
 26+haiku*)
 27+ lt_cv_deplibs_check_method=pass_all
 28+ ;;
 29+
 30 hpux10.20* | hpux11*)
 31 lt_cv_file_magic_cmd=/usr/bin/file
 32 case $host_cpu in
 33@@ -5718,7 +5729,7 @@ newos6*)
23 ;; 34 ;;
24  35
25 *nto* | *qnx*) 36 *nto* | *qnx*)
26- lt_cv_deplibs_check_method=pass_all 37- lt_cv_deplibs_check_method=pass_all
27+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$' 38+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$'
28 ;; 39 ;;
29  40
30 openbsd*) 41 openbsd*)
31@@ -7900,7 +7907,10 @@ for cc_temp in $compiler""; do 42@@ -7900,7 +7911,10 @@ for cc_temp in $compiler""; do
32 *) break;; 43 *) break;;
33 esac 44 esac
34 done 45 done
35-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 46-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
36+# Return the actual command name, not our pkgsrc wrapper name because several 47+# Return the actual command name, not our pkgsrc wrapper name because several
37+# decisions are made only based on compiler names 48+# decisions are made only based on compiler names
38+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi 49+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
39+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 50+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
40  51
41  52
42 # Only perform the check for file, if the check method requires it 53 # Only perform the check for file, if the check method requires it
43@@ -8210,9 +8220,11 @@ $as_echo_n "checking for $compiler optio 54@@ -8210,9 +8224,17 @@ $as_echo_n "checking for $compiler optio
44 ;; 55 ;;
45  56
46 darwin* | rhapsody*) 57 darwin* | rhapsody*)
47- # PIC is the default on this platform 58- # PIC is the default on this platform
48+ # PIC is the default on this platform, and static linking of 59+ # PIC is the default on this platform, and static linking of
49+ # binaries generally doesn't work 60+ # binaries generally doesn't work
50 # Common symbols not allowed in MH_DYLIB files 61 # Common symbols not allowed in MH_DYLIB files
51 lt_prog_compiler_pic='-fno-common' 62 lt_prog_compiler_pic='-fno-common'
52+ lt_prog_compiler_static='' 63+ lt_prog_compiler_static=''
 64+ ;;
 65+
 66+ haiku*)
 67+ # PIC is the default for Haiku.
 68+ # The "-static" flag exists, but is broken.
 69+ lt_prog_compiler_static=
53 ;; 70 ;;
54  71
55 hpux*) 72 hpux*)
56@@ -8234,6 +8246,13 @@ $as_echo_n "checking for $compiler optio 73@@ -8234,6 +8256,13 @@ $as_echo_n "checking for $compiler optio
57 # Instead, we relocate shared libraries at runtime. 74 # Instead, we relocate shared libraries at runtime.
58 ;; 75 ;;
59  76
60+ mint*) 77+ mint*)
61+ # Just because we use GCC doesn't mean we suddenly get shared libraries 78+ # Just because we use GCC doesn't mean we suddenly get shared libraries
62+ # on systems that don't support them. 79+ # on systems that don't support them.
63+ lt_prog_compiler_can_build_shared=no 80+ lt_prog_compiler_can_build_shared=no
64+ enable_shared=no 81+ enable_shared=no
65+ ;; 82+ ;;
66+ 83+
67 msdosdjgpp*) 84 msdosdjgpp*)
68 # Just because we use GCC doesn't mean we suddenly get shared libraries 85 # Just because we use GCC doesn't mean we suddenly get shared libraries
69 # on systems that don't support them. 86 # on systems that don't support them.
70@@ -8431,6 +8450,9 @@ $as_echo_n "checking for $compiler optio 87@@ -8431,6 +8460,9 @@ $as_echo_n "checking for $compiler optio
71  88
72 case $host_os in 89 case $host_os in
73 # For platforms which do not support PIC, -DPIC is meaningless: 90 # For platforms which do not support PIC, -DPIC is meaningless:
74+ mint*) 91+ mint*)
75+ lt_prog_compiler_pic= 92+ lt_prog_compiler_pic=
76+ ;; 93+ ;;
77 *djgpp*) 94 *djgpp*)
78 lt_prog_compiler_pic= 95 lt_prog_compiler_pic=
79 ;; 96 ;;
80@@ -8930,7 +8952,7 @@ _LT_EOF 97@@ -8844,6 +8876,11 @@ _LT_EOF
 98 fi
 99 ;;
 100
 101+ haiku*)
 102+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 103+ link_all_deplibs=yes
 104+ ;;
 105+
 106 interix[3-9]*)
 107 hardcode_direct=no
 108 hardcode_shlibpath_var=no
 109@@ -8930,7 +8967,7 @@ _LT_EOF
81 ;; 110 ;;
82  111
83 netbsd*) 112 netbsd*)
84- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 113- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
85+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then 114+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
86 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 115 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
87 wlarc= 116 wlarc=
88 else 117 else
89@@ -9450,6 +9472,8 @@ rm -f core conftest.err conftest.$ac_obj 118@@ -9450,6 +9487,8 @@ rm -f core conftest.err conftest.$ac_obj
90 ;; 119 ;;
91  120
92 *nto* | *qnx*) 121 *nto* | *qnx*)
93+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 122+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
94+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 123+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
95 ;; 124 ;;
96  125
97 openbsd*) 126 openbsd*)
98@@ -10064,6 +10088,7 @@ beos*) 127@@ -10064,6 +10103,7 @@ beos*)
99 bsdi[45]*) 128 bsdi[45]*)
100 version_type=linux 129 version_type=linux
101 need_version=no 130 need_version=no
102+ need_lib_prefix=no 131+ need_lib_prefix=no
103 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 132 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
104 soname_spec='${libname}${release}${shared_ext}$major' 133 soname_spec='${libname}${release}${shared_ext}$major'
105 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' 134 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
106@@ -10165,9 +10190,7 @@ freebsd1*) 135@@ -10165,9 +10205,7 @@ freebsd1*)
107 dynamic_linker=no 136 dynamic_linker=no
108 ;; 137 ;;
109  138
110-freebsd* | dragonfly*) 139-freebsd* | dragonfly*)
111- # DragonFly does not have aout. When/if they implement a new 140- # DragonFly does not have aout. When/if they implement a new
112- # versioning mechanism, adjust this. 141- # versioning mechanism, adjust this.
113+freebsd*) 142+freebsd*)
114 if test -x /usr/bin/objformat; then 143 if test -x /usr/bin/objformat; then
115 objformat=`/usr/bin/objformat` 144 objformat=`/usr/bin/objformat`
116 else 145 else
117@@ -10179,7 +10202,7 @@ freebsd* | dragonfly*) 146@@ -10179,7 +10217,7 @@ freebsd* | dragonfly*)
118 version_type=freebsd-$objformat 147 version_type=freebsd-$objformat
119 case $version_type in 148 case $version_type in
120 freebsd-elf*) 149 freebsd-elf*)
121- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' 150- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
122+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 151+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
123 need_version=no 152 need_version=no
124 need_lib_prefix=no 153 need_lib_prefix=no
125 ;; 154 ;;
126@@ -10202,13 +10225,24 @@ freebsd* | dragonfly*) 155@@ -10202,13 +10240,24 @@ freebsd* | dragonfly*)
127 shlibpath_overrides_runpath=no 156 shlibpath_overrides_runpath=no
128 hardcode_into_libs=yes 157 hardcode_into_libs=yes
129 ;; 158 ;;
130- *) # from 4.6 on, and DragonFly 159- *) # from 4.6 on, and DragonFly
131+ *) # from 4.6 on 160+ *) # from 4.6 on
132 shlibpath_overrides_runpath=yes 161 shlibpath_overrides_runpath=yes
133 hardcode_into_libs=yes 162 hardcode_into_libs=yes
134 ;; 163 ;;
135 esac 164 esac
136 ;; 165 ;;
137  166
138+dragonfly*) 167+dragonfly*)
139+ version_type=linux 168+ version_type=linux
140+ need_version=no 169+ need_version=no
141+ need_lib_prefix=no 170+ need_lib_prefix=no
142+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 171+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
143+ soname_spec='${libname}${release}${shared_ext}$major' 172+ soname_spec='${libname}${release}${shared_ext}$major'
144+ shlibpath_var=LD_LIBRARY_PATH 173+ shlibpath_var=LD_LIBRARY_PATH
145+ shlibpath_overrides_runpath=no 174+ shlibpath_overrides_runpath=no
146+ hardcode_into_libs=yes 175+ hardcode_into_libs=yes
147+ ;; 176+ ;;
148+ 177+
149 gnu*) 178 gnu*)
150 version_type=linux 179 version_type=linux
151 need_lib_prefix=no 180 need_lib_prefix=no
152@@ -10280,12 +10314,7 @@ interix[3-9]*) 181@@ -10219,6 +10268,19 @@ gnu*)
 182 hardcode_into_libs=yes
 183 ;;
 184
 185+haiku*)
 186+ version_type=linux
 187+ need_lib_prefix=no
 188+ need_version=no
 189+ dynamic_linker="$host_os runtime_loader"
 190+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 191+ soname_spec='${libname}${release}${shared_ext}$major'
 192+ shlibpath_var=LIBRARY_PATH
 193+ shlibpath_overrides_runpath=yes
 194+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 195+ hardcode_into_libs=yes
 196+ ;;
 197+
 198 hpux9* | hpux10* | hpux11*)
 199 # Give a soname corresponding to the major version so that dld.sl refuses to
 200 # link against other versions.
 201@@ -10280,12 +10342,7 @@ interix[3-9]*)
153 irix5* | irix6* | nonstopux*) 202 irix5* | irix6* | nonstopux*)
154 case $host_os in 203 case $host_os in
155 nonstopux*) version_type=nonstopux ;; 204 nonstopux*) version_type=nonstopux ;;
156- *) 205- *)
157- if test "$lt_cv_prog_gnu_ld" = yes; then 206- if test "$lt_cv_prog_gnu_ld" = yes; then
158- version_type=linux 207- version_type=linux
159- else 208- else
160- version_type=irix 209- version_type=irix
161- fi ;; 210- fi ;;
162+ *) version_type=irix ;; 211+ *) version_type=irix ;;
163 esac 212 esac
164 need_lib_prefix=no 213 need_lib_prefix=no
165 need_version=no 214 need_version=no
166@@ -10376,15 +10405,14 @@ rm -f core conftest.err conftest.$ac_obj 215@@ -10376,15 +10433,14 @@ rm -f core conftest.err conftest.$ac_obj
167 ;; 216 ;;
168  217
169 netbsd*) 218 netbsd*)
170- version_type=sunos 219- version_type=sunos
171+ version_type=linux 220+ version_type=linux
172 need_lib_prefix=no 221 need_lib_prefix=no
173 need_version=no 222 need_version=no
174- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 223- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
175- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 224- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
176+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 225+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
177+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then 226+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
178 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 227 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
179 dynamic_linker='NetBSD (a.out) ld.so' 228 dynamic_linker='NetBSD (a.out) ld.so'
180 else 229 else
181- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 230- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
182 soname_spec='${libname}${release}${shared_ext}$major' 231 soname_spec='${libname}${release}${shared_ext}$major'
183 dynamic_linker='NetBSD ld.elf_so' 232 dynamic_linker='NetBSD ld.elf_so'
184 fi 233 fi
185@@ -10413,7 +10441,7 @@ newsos6) 234@@ -10413,7 +10469,7 @@ newsos6)
186 ;; 235 ;;
187  236
188 openbsd*) 237 openbsd*)
189- version_type=sunos 238- version_type=sunos
190+ version_type=linux 239+ version_type=linux
191 sys_lib_dlsearch_path_spec="/usr/lib" 240 sys_lib_dlsearch_path_spec="/usr/lib"
192 need_lib_prefix=no 241 need_lib_prefix=no
193 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. 242 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
194@@ -10421,7 +10449,7 @@ openbsd*) 243@@ -10421,7 +10477,7 @@ openbsd*)
195 openbsd3.3 | openbsd3.3.*) need_version=yes ;; 244 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
196 *) need_version=no ;; 245 *) need_version=no ;;
197 esac 246 esac
198- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 247- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
199+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 248+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
200 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 249 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
201 shlibpath_var=LD_LIBRARY_PATH 250 shlibpath_var=LD_LIBRARY_PATH
202 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 251 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
203@@ -12587,9 +12615,7 @@ else 252@@ -12587,9 +12643,7 @@ else
204 fi 253 fi
205  254
206  255
207-if test -n "$CXX" && ( test "X$CXX" != "Xno" && 256-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
208- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 257- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
209- (test "X$CXX" != "Xg++"))) ; then 258- (test "X$CXX" != "Xg++"))) ; then
210+if test -n "$CXX" && test "X$CXX" != "Xno" ; then 259+if test -n "$CXX" && test "X$CXX" != "Xno" ; then
211 ac_ext=cpp 260 ac_ext=cpp
212 ac_cpp='$CXXCPP $CPPFLAGS' 261 ac_cpp='$CXXCPP $CPPFLAGS'
213 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 262 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
214@@ -12836,7 +12862,10 @@ $RM -r conftest* 263@@ -12836,7 +12890,10 @@ $RM -r conftest*
215 *) break;; 264 *) break;;
216 esac 265 esac
217 done 266 done
218-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 267-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
219+# Return the actual command name, not our pkgsrc wrapper name because several 268+# Return the actual command name, not our pkgsrc wrapper name because several
220+# decisions are made only based on compiler names 269+# decisions are made only based on compiler names
221+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi 270+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
222+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 271+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
223  272
224  273
225 if test -n "$compiler"; then 274 if test -n "$compiler"; then
226@@ -13628,18 +13657,37 @@ if test -z "$aix_libpath"; then aix_libp 275@@ -13305,6 +13362,11 @@ if test -z "$aix_libpath"; then aix_libp
 276 gnu*)
 277 ;;
 278
 279+ haiku*)
 280+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 281+ link_all_deplibs_CXX=yes
 282+ ;;
 283+
 284 hpux9*)
 285 hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 286 hardcode_libdir_separator_CXX=:
 287@@ -13628,18 +13690,37 @@ if test -z "$aix_libpath"; then aix_libp
227  288
228 netbsd*) 289 netbsd*)
229 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 290 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
230+ # a.out is quite broken and goes directly to ld 291+ # a.out is quite broken and goes directly to ld
231 archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' 292 archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
232 wlarc= 293 wlarc=
233+ # Determine if we need to override the c++rt0 that is 294+ # Determine if we need to override the c++rt0 that is
234+ # picked up by analysing output_verbose_link_cmds 295+ # picked up by analysing output_verbose_link_cmds
235+ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then 296+ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
236+ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC" 297+ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
237+ else 298+ else
238+ cpprt0_file= 299+ cpprt0_file=
239+ fi 300+ fi
@@ -255,610 +316,734 @@ The problem manifests with wl and no_bui @@ -255,610 +316,734 @@ The problem manifests with wl and no_bui
255 ;; 316 ;;
256  317
257 *nto* | *qnx*) 318 *nto* | *qnx*)
258- ld_shlibs_CXX=yes 319- ld_shlibs_CXX=yes
259+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 320+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
260+ archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 321+ archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
261+ hardcode_libdir_flag_spec_CXX='-R$libdir' 322+ hardcode_libdir_flag_spec_CXX='-R$libdir'
262+ hardcode_direct_CXX=yes 323+ hardcode_direct_CXX=yes
263+ hardcode_shlibpath_var_CXX=no 324+ hardcode_shlibpath_var_CXX=no
264+ output_verbose_link_cmd='echo' 325+ output_verbose_link_cmd='echo'
265 ;; 326 ;;
266  327
267 openbsd2*) 328 openbsd2*)
268@@ -14036,6 +14084,11 @@ $RM -f confest.$objext 329@@ -14036,6 +14117,11 @@ $RM -f confest.$objext
269  330
270 # PORTME: override above test on systems where it is broken 331 # PORTME: override above test on systems where it is broken
271 case $host_os in 332 case $host_os in
272+netbsd*) 333+netbsd*)
273+ if test -n "$cpprt0_file"; then 334+ if test -n "$cpprt0_file"; then
274+ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` 335+ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
275+ fi 336+ fi
276+ ;; 337+ ;;
277 interix[3-9]*) 338 interix[3-9]*)
278 # Interix 3.5 installs completely hosed .la files for C++, so rather than 339 # Interix 3.5 installs completely hosed .la files for C++, so rather than
279 # hack all around it, let's just trust "g++" to DTRT. 340 # hack all around it, let's just trust "g++" to DTRT.
280@@ -14176,9 +14229,15 @@ $as_echo_n "checking for $compiler optio 341@@ -14176,14 +14262,25 @@ $as_echo_n "checking for $compiler optio
281 lt_prog_compiler_pic_CXX='-DDLL_EXPORT' 342 lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
282 ;; 343 ;;
283 darwin* | rhapsody*) 344 darwin* | rhapsody*)
284- # PIC is the default on this platform 345- # PIC is the default on this platform
285+ # PIC is the default on this platform, and static linking of 346+ # PIC is the default on this platform, and static linking of
286+ # binaries generally doesn't work 347+ # binaries generally doesn't work
287 # Common symbols not allowed in MH_DYLIB files 348 # Common symbols not allowed in MH_DYLIB files
288 lt_prog_compiler_pic_CXX='-fno-common' 349 lt_prog_compiler_pic_CXX='-fno-common'
289+ lt_prog_compiler_static_CXX='' 350+ lt_prog_compiler_static_CXX=''
290+ ;; 351+ ;;
291+ *mint*) 352+ *mint*)
292+ # FreeMiNT does not support shared libraries at all 353+ # FreeMiNT does not support shared libraries at all
293+ lt_prog_compiler_pic_CXX= 354+ lt_prog_compiler_pic_CXX=
294 ;; 355 ;;
295 *djgpp*) 356 *djgpp*)
296 # DJGPP does not support shared libraries at all 357 # DJGPP does not support shared libraries at all
297@@ -14246,6 +14305,9 @@ $as_echo_n "checking for $compiler optio 358 lt_prog_compiler_pic_CXX=
 359 ;;
 360+ haiku*)
 361+ # PIC is the default for Haiku.
 362+ # The "-static" flag exists, but is broken.
 363+ lt_prog_compiler_static_CXX=
 364+ ;;
 365 interix[3-9]*)
 366 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 367 # Instead, we relocate shared libraries at runtime.
 368@@ -14246,6 +14343,9 @@ $as_echo_n "checking for $compiler optio
298 ;; 369 ;;
299 esac 370 esac
300 ;; 371 ;;
301+ mint*) 372+ mint*)
302+ # FreeMiNT uses GNU C++ 373+ # FreeMiNT uses GNU C++
303+ ;; 374+ ;;
304 freebsd* | dragonfly*) 375 freebsd* | dragonfly*)
305 # FreeBSD uses GNU C++ 376 # FreeBSD uses GNU C++
306 ;; 377 ;;
307@@ -14443,6 +14505,9 @@ $as_echo_n "checking for $compiler optio 378@@ -14443,6 +14543,9 @@ $as_echo_n "checking for $compiler optio
308  379
309 case $host_os in 380 case $host_os in
310 # For platforms which do not support PIC, -DPIC is meaningless: 381 # For platforms which do not support PIC, -DPIC is meaningless:
311+ mint*) 382+ mint*)
312+ lt_prog_compiler_pic_CXX= 383+ lt_prog_compiler_pic_CXX=
313+ ;; 384+ ;;
314 *djgpp*) 385 *djgpp*)
315 lt_prog_compiler_pic_CXX= 386 lt_prog_compiler_pic_CXX=
316 ;; 387 ;;
317@@ -14948,6 +15013,7 @@ beos*) 388@@ -14948,6 +15051,7 @@ beos*)
318 bsdi[45]*) 389 bsdi[45]*)
319 version_type=linux 390 version_type=linux
320 need_version=no 391 need_version=no
321+ need_lib_prefix=no 392+ need_lib_prefix=no
322 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 393 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
323 soname_spec='${libname}${release}${shared_ext}$major' 394 soname_spec='${libname}${release}${shared_ext}$major'
324 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' 395 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
325@@ -15048,9 +15114,7 @@ freebsd1*) 396@@ -15048,9 +15152,7 @@ freebsd1*)
326 dynamic_linker=no 397 dynamic_linker=no
327 ;; 398 ;;
328  399
329-freebsd* | dragonfly*) 400-freebsd* | dragonfly*)
330- # DragonFly does not have aout. When/if they implement a new 401- # DragonFly does not have aout. When/if they implement a new
331- # versioning mechanism, adjust this. 402- # versioning mechanism, adjust this.
332+freebsd*) 403+freebsd*)
333 if test -x /usr/bin/objformat; then 404 if test -x /usr/bin/objformat; then
334 objformat=`/usr/bin/objformat` 405 objformat=`/usr/bin/objformat`
335 else 406 else
336@@ -15062,7 +15126,7 @@ freebsd* | dragonfly*) 407@@ -15062,7 +15164,7 @@ freebsd* | dragonfly*)
337 version_type=freebsd-$objformat 408 version_type=freebsd-$objformat
338 case $version_type in 409 case $version_type in
339 freebsd-elf*) 410 freebsd-elf*)
340- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' 411- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
341+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 412+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
342 need_version=no 413 need_version=no
343 need_lib_prefix=no 414 need_lib_prefix=no
344 ;; 415 ;;
345@@ -15085,13 +15149,24 @@ freebsd* | dragonfly*) 416@@ -15085,13 +15187,24 @@ freebsd* | dragonfly*)
346 shlibpath_overrides_runpath=no 417 shlibpath_overrides_runpath=no
347 hardcode_into_libs=yes 418 hardcode_into_libs=yes
348 ;; 419 ;;
349- *) # from 4.6 on, and DragonFly 420- *) # from 4.6 on, and DragonFly
350+ *) # from 4.6 on 421+ *) # from 4.6 on
351 shlibpath_overrides_runpath=yes 422 shlibpath_overrides_runpath=yes
352 hardcode_into_libs=yes 423 hardcode_into_libs=yes
353 ;; 424 ;;
354 esac 425 esac
355 ;; 426 ;;
356  427
357+dragonfly*) 428+dragonfly*)
358+ version_type=linux 429+ version_type=linux
359+ need_version=no 430+ need_version=no
360+ need_lib_prefix=no 431+ need_lib_prefix=no
361+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 432+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
362+ soname_spec='${libname}${release}${shared_ext}$major' 433+ soname_spec='${libname}${release}${shared_ext}$major'
363+ shlibpath_var=LD_LIBRARY_PATH 434+ shlibpath_var=LD_LIBRARY_PATH
364+ shlibpath_overrides_runpath=no 435+ shlibpath_overrides_runpath=no
365+ hardcode_into_libs=yes 436+ hardcode_into_libs=yes
366+ ;; 437+ ;;
367+ 438+
368 gnu*) 439 gnu*)
369 version_type=linux 440 version_type=linux
370 need_lib_prefix=no 441 need_lib_prefix=no
371@@ -15163,12 +15238,7 @@ interix[3-9]*) 442@@ -15102,6 +15215,19 @@ gnu*)
 443 hardcode_into_libs=yes
 444 ;;
 445
 446+haiku*)
 447+ version_type=linux
 448+ need_lib_prefix=no
 449+ need_version=no
 450+ dynamic_linker="$host_os runtime_loader"
 451+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 452+ soname_spec='${libname}${release}${shared_ext}$major'
 453+ shlibpath_var=LIBRARY_PATH
 454+ shlibpath_overrides_runpath=yes
 455+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 456+ hardcode_into_libs=yes
 457+ ;;
 458+
 459 hpux9* | hpux10* | hpux11*)
 460 # Give a soname corresponding to the major version so that dld.sl refuses to
 461 # link against other versions.
 462@@ -15163,12 +15289,7 @@ interix[3-9]*)
372 irix5* | irix6* | nonstopux*) 463 irix5* | irix6* | nonstopux*)
373 case $host_os in 464 case $host_os in
374 nonstopux*) version_type=nonstopux ;; 465 nonstopux*) version_type=nonstopux ;;
375- *) 466- *)
376- if test "$lt_cv_prog_gnu_ld" = yes; then 467- if test "$lt_cv_prog_gnu_ld" = yes; then
377- version_type=linux 468- version_type=linux
378- else 469- else
379- version_type=irix 470- version_type=irix
380- fi ;; 471- fi ;;
381+ *) version_type=irix ;; 472+ *) version_type=irix ;;
382 esac 473 esac
383 need_lib_prefix=no 474 need_lib_prefix=no
384 need_version=no 475 need_version=no
385@@ -15259,15 +15329,14 @@ rm -f core conftest.err conftest.$ac_obj 476@@ -15259,15 +15380,14 @@ rm -f core conftest.err conftest.$ac_obj
386 ;; 477 ;;
387  478
388 netbsd*) 479 netbsd*)
389- version_type=sunos 480- version_type=sunos
390+ version_type=linux 481+ version_type=linux
391 need_lib_prefix=no 482 need_lib_prefix=no
392 need_version=no 483 need_version=no
393- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 484- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
394- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 485- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
395+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 486+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
396+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then 487+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
397 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 488 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
398 dynamic_linker='NetBSD (a.out) ld.so' 489 dynamic_linker='NetBSD (a.out) ld.so'
399 else 490 else
400- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 491- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
401 soname_spec='${libname}${release}${shared_ext}$major' 492 soname_spec='${libname}${release}${shared_ext}$major'
402 dynamic_linker='NetBSD ld.elf_so' 493 dynamic_linker='NetBSD ld.elf_so'
403 fi 494 fi
404@@ -15296,7 +15365,7 @@ newsos6) 495@@ -15296,7 +15416,7 @@ newsos6)
405 ;; 496 ;;
406  497
407 openbsd*) 498 openbsd*)
408- version_type=sunos 499- version_type=sunos
409+ version_type=linux 500+ version_type=linux
410 sys_lib_dlsearch_path_spec="/usr/lib" 501 sys_lib_dlsearch_path_spec="/usr/lib"
411 need_lib_prefix=no 502 need_lib_prefix=no
412 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. 503 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
413@@ -15304,7 +15373,7 @@ openbsd*) 504@@ -15304,7 +15424,7 @@ openbsd*)
414 openbsd3.3 | openbsd3.3.*) need_version=yes ;; 505 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
415 *) need_version=no ;; 506 *) need_version=no ;;
416 esac 507 esac
417- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 508- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
418+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 509+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
419 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 510 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
420 shlibpath_var=LD_LIBRARY_PATH 511 shlibpath_var=LD_LIBRARY_PATH
421 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 512 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
422@@ -15877,7 +15946,10 @@ $RM -r conftest* 513@@ -15877,7 +15997,10 @@ $RM -r conftest*
423 *) break;; 514 *) break;;
424 esac 515 esac
425 done 516 done
426-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 517-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
427+# Return the actual command name, not our pkgsrc wrapper name because several 518+# Return the actual command name, not our pkgsrc wrapper name because several
428+# decisions are made only based on compiler names 519+# decisions are made only based on compiler names
429+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi 520+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
430+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 521+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
431  522
432 GCC=$G77 523 GCC=$G77
433 if test -n "$compiler"; then 524 if test -n "$compiler"; then
434@@ -15971,9 +16043,11 @@ $as_echo_n "checking for $compiler optio 525@@ -15971,9 +16094,17 @@ $as_echo_n "checking for $compiler optio
435 ;; 526 ;;
436  527
437 darwin* | rhapsody*) 528 darwin* | rhapsody*)
438- # PIC is the default on this platform 529- # PIC is the default on this platform
439+ # PIC is the default on this platform, and static linking of 530+ # PIC is the default on this platform, and static linking of
440+ # binaries generally doesn't work 531+ # binaries generally doesn't work
441 # Common symbols not allowed in MH_DYLIB files 532 # Common symbols not allowed in MH_DYLIB files
442 lt_prog_compiler_pic_F77='-fno-common' 533 lt_prog_compiler_pic_F77='-fno-common'
443+ lt_prog_compiler_static_F77='' 534+ lt_prog_compiler_static_F77=''
 535+ ;;
 536+
 537+ haiku*)
 538+ # PIC is the default for Haiku.
 539+ # The "-static" flag exists, but is broken.
 540+ lt_prog_compiler_static_F77=
444 ;; 541 ;;
445  542
446 hpux*) 543 hpux*)
447@@ -15995,6 +16069,13 @@ $as_echo_n "checking for $compiler optio 544@@ -15995,6 +16126,13 @@ $as_echo_n "checking for $compiler optio
448 # Instead, we relocate shared libraries at runtime. 545 # Instead, we relocate shared libraries at runtime.
449 ;; 546 ;;
450  547
451+ mint*) 548+ mint*)
452+ # Just because we use GCC doesn't mean we suddenly get shared libraries 549+ # Just because we use GCC doesn't mean we suddenly get shared libraries
453+ # on systems that don't support them. 550+ # on systems that don't support them.
454+ lt_prog_compiler_can_build_shared_F77=no 551+ lt_prog_compiler_can_build_shared_F77=no
455+ enable_shared=no 552+ enable_shared=no
456+ ;; 553+ ;;
457+ 554+
458 msdosdjgpp*) 555 msdosdjgpp*)
459 # Just because we use GCC doesn't mean we suddenly get shared libraries 556 # Just because we use GCC doesn't mean we suddenly get shared libraries
460 # on systems that don't support them. 557 # on systems that don't support them.
461@@ -16192,6 +16273,9 @@ $as_echo_n "checking for $compiler optio 558@@ -16192,6 +16330,9 @@ $as_echo_n "checking for $compiler optio
462  559
463 case $host_os in 560 case $host_os in
464 # For platforms which do not support PIC, -DPIC is meaningless: 561 # For platforms which do not support PIC, -DPIC is meaningless:
465+ mint*) 562+ mint*)
466+ lt_prog_compiler_pic_F77= 563+ lt_prog_compiler_pic_F77=
467+ ;; 564+ ;;
468 *djgpp*) 565 *djgpp*)
469 lt_prog_compiler_pic_F77= 566 lt_prog_compiler_pic_F77=
470 ;; 567 ;;
471@@ -16676,7 +16760,7 @@ _LT_EOF 568@@ -16590,6 +16731,11 @@ _LT_EOF
 569 fi
 570 ;;
 571
 572+ haiku*)
 573+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 574+ link_all_deplibs_F77=yes
 575+ ;;
 576+
 577 interix[3-9]*)
 578 hardcode_direct_F77=no
 579 hardcode_shlibpath_var_F77=no
 580@@ -16676,7 +16822,7 @@ _LT_EOF
472 ;; 581 ;;
473  582
474 netbsd*) 583 netbsd*)
475- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 584- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
476+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then 585+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
477 archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 586 archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
478 wlarc= 587 wlarc=
479 else 588 else
480@@ -17183,6 +17267,8 @@ rm -f core conftest.err conftest.$ac_obj 589@@ -17183,6 +17329,8 @@ rm -f core conftest.err conftest.$ac_obj
481 ;; 590 ;;
482  591
483 *nto* | *qnx*) 592 *nto* | *qnx*)
484+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 593+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
485+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 594+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
486 ;; 595 ;;
487  596
488 openbsd*) 597 openbsd*)
489@@ -17644,6 +17730,7 @@ beos*) 598@@ -17644,6 +17792,7 @@ beos*)
490 bsdi[45]*) 599 bsdi[45]*)
491 version_type=linux 600 version_type=linux
492 need_version=no 601 need_version=no
493+ need_lib_prefix=no 602+ need_lib_prefix=no
494 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 603 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
495 soname_spec='${libname}${release}${shared_ext}$major' 604 soname_spec='${libname}${release}${shared_ext}$major'
496 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' 605 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
497@@ -17744,9 +17831,7 @@ freebsd1*) 606@@ -17744,9 +17893,7 @@ freebsd1*)
498 dynamic_linker=no 607 dynamic_linker=no
499 ;; 608 ;;
500  609
501-freebsd* | dragonfly*) 610-freebsd* | dragonfly*)
502- # DragonFly does not have aout. When/if they implement a new 611- # DragonFly does not have aout. When/if they implement a new
503- # versioning mechanism, adjust this. 612- # versioning mechanism, adjust this.
504+freebsd*) 613+freebsd*)
505 if test -x /usr/bin/objformat; then 614 if test -x /usr/bin/objformat; then
506 objformat=`/usr/bin/objformat` 615 objformat=`/usr/bin/objformat`
507 else 616 else
508@@ -17758,7 +17843,7 @@ freebsd* | dragonfly*) 617@@ -17758,7 +17905,7 @@ freebsd* | dragonfly*)
509 version_type=freebsd-$objformat 618 version_type=freebsd-$objformat
510 case $version_type in 619 case $version_type in
511 freebsd-elf*) 620 freebsd-elf*)
512- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' 621- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
513+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 622+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
514 need_version=no 623 need_version=no
515 need_lib_prefix=no 624 need_lib_prefix=no
516 ;; 625 ;;
517@@ -17781,13 +17866,24 @@ freebsd* | dragonfly*) 626@@ -17781,13 +17928,24 @@ freebsd* | dragonfly*)
518 shlibpath_overrides_runpath=no 627 shlibpath_overrides_runpath=no
519 hardcode_into_libs=yes 628 hardcode_into_libs=yes
520 ;; 629 ;;
521- *) # from 4.6 on, and DragonFly 630- *) # from 4.6 on, and DragonFly
522+ *) # from 4.6 on 631+ *) # from 4.6 on
523 shlibpath_overrides_runpath=yes 632 shlibpath_overrides_runpath=yes
524 hardcode_into_libs=yes 633 hardcode_into_libs=yes
525 ;; 634 ;;
526 esac 635 esac
527 ;; 636 ;;
528  637
529+dragonfly*) 638+dragonfly*)
530+ version_type=linux 639+ version_type=linux
531+ need_version=no 640+ need_version=no
532+ need_lib_prefix=no 641+ need_lib_prefix=no
533+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 642+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
534+ soname_spec='${libname}${release}${shared_ext}$major' 643+ soname_spec='${libname}${release}${shared_ext}$major'
535+ shlibpath_var=LD_LIBRARY_PATH 644+ shlibpath_var=LD_LIBRARY_PATH
536+ shlibpath_overrides_runpath=no 645+ shlibpath_overrides_runpath=no
537+ hardcode_into_libs=yes 646+ hardcode_into_libs=yes
538+ ;; 647+ ;;
539+ 648+
540 gnu*) 649 gnu*)
541 version_type=linux 650 version_type=linux
542 need_lib_prefix=no 651 need_lib_prefix=no
543@@ -17859,12 +17955,7 @@ interix[3-9]*) 652@@ -17798,6 +17956,19 @@ gnu*)
 653 hardcode_into_libs=yes
 654 ;;
 655
 656+haiku*)
 657+ version_type=linux
 658+ need_lib_prefix=no
 659+ need_version=no
 660+ dynamic_linker="$host_os runtime_loader"
 661+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 662+ soname_spec='${libname}${release}${shared_ext}$major'
 663+ shlibpath_var=LIBRARY_PATH
 664+ shlibpath_overrides_runpath=yes
 665+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 666+ hardcode_into_libs=yes
 667+ ;;
 668+
 669 hpux9* | hpux10* | hpux11*)
 670 # Give a soname corresponding to the major version so that dld.sl refuses to
 671 # link against other versions.
 672@@ -17859,12 +18030,7 @@ interix[3-9]*)
544 irix5* | irix6* | nonstopux*) 673 irix5* | irix6* | nonstopux*)
545 case $host_os in 674 case $host_os in
546 nonstopux*) version_type=nonstopux ;; 675 nonstopux*) version_type=nonstopux ;;
547- *) 676- *)
548- if test "$lt_cv_prog_gnu_ld" = yes; then 677- if test "$lt_cv_prog_gnu_ld" = yes; then
549- version_type=linux 678- version_type=linux
550- else 679- else
551- version_type=irix 680- version_type=irix
552- fi ;; 681- fi ;;
553+ *) version_type=irix ;; 682+ *) version_type=irix ;;
554 esac 683 esac
555 need_lib_prefix=no 684 need_lib_prefix=no
556 need_version=no 685 need_version=no
557@@ -17949,15 +18040,14 @@ rm -f core conftest.err conftest.$ac_obj 686@@ -17949,15 +18115,14 @@ rm -f core conftest.err conftest.$ac_obj
558 ;; 687 ;;
559  688
560 netbsd*) 689 netbsd*)
561- version_type=sunos 690- version_type=sunos
562+ version_type=linux 691+ version_type=linux
563 need_lib_prefix=no 692 need_lib_prefix=no
564 need_version=no 693 need_version=no
565- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 694- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
566- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 695- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
567+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 696+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
568+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then 697+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
569 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 698 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
570 dynamic_linker='NetBSD (a.out) ld.so' 699 dynamic_linker='NetBSD (a.out) ld.so'
571 else 700 else
572- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 701- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
573 soname_spec='${libname}${release}${shared_ext}$major' 702 soname_spec='${libname}${release}${shared_ext}$major'
574 dynamic_linker='NetBSD ld.elf_so' 703 dynamic_linker='NetBSD ld.elf_so'
575 fi 704 fi
576@@ -17986,7 +18076,7 @@ newsos6) 705@@ -17986,7 +18151,7 @@ newsos6)
577 ;; 706 ;;
578  707
579 openbsd*) 708 openbsd*)
580- version_type=sunos 709- version_type=sunos
581+ version_type=linux 710+ version_type=linux
582 sys_lib_dlsearch_path_spec="/usr/lib" 711 sys_lib_dlsearch_path_spec="/usr/lib"
583 need_lib_prefix=no 712 need_lib_prefix=no
584 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. 713 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
585@@ -17994,7 +18084,7 @@ openbsd*) 714@@ -17994,7 +18159,7 @@ openbsd*)
586 openbsd3.3 | openbsd3.3.*) need_version=yes ;; 715 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
587 *) need_version=no ;; 716 *) need_version=no ;;
588 esac 717 esac
589- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 718- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
590+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 719+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
591 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 720 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
592 shlibpath_var=LD_LIBRARY_PATH 721 shlibpath_var=LD_LIBRARY_PATH
593 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 722 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
594@@ -18557,7 +18647,10 @@ $RM -r conftest* 723@@ -18557,7 +18722,10 @@ $RM -r conftest*
595 *) break;; 724 *) break;;
596 esac 725 esac
597 done 726 done
598-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 727-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
599+# Return the actual command name, not our pkgsrc wrapper name because several 728+# Return the actual command name, not our pkgsrc wrapper name because several
600+# decisions are made only based on compiler names 729+# decisions are made only based on compiler names
601+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi 730+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
602+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 731+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
603  732
604  733
605 if test -n "$compiler"; then 734 if test -n "$compiler"; then
606@@ -18776,9 +18869,11 @@ $as_echo_n "checking for $compiler optio 735@@ -18776,9 +18944,17 @@ $as_echo_n "checking for $compiler optio
607 ;; 736 ;;
608  737
609 darwin* | rhapsody*) 738 darwin* | rhapsody*)
610- # PIC is the default on this platform 739- # PIC is the default on this platform
611+ # PIC is the default on this platform, and static linking of 740+ # PIC is the default on this platform, and static linking of
612+ # binaries generally doesn't work 741+ # binaries generally doesn't work
613 # Common symbols not allowed in MH_DYLIB files 742 # Common symbols not allowed in MH_DYLIB files
614 lt_prog_compiler_pic_FC='-fno-common' 743 lt_prog_compiler_pic_FC='-fno-common'
615+ lt_prog_compiler_static_FC='' 744+ lt_prog_compiler_static_FC=''
 745+ ;;
 746+
 747+ haiku*)
 748+ # PIC is the default for Haiku.
 749+ # The "-static" flag exists, but is broken.
 750+ lt_prog_compiler_static_FC=
616 ;; 751 ;;
617  752
618 hpux*) 753 hpux*)
619@@ -18800,6 +18895,13 @@ $as_echo_n "checking for $compiler optio 754@@ -18800,6 +18976,13 @@ $as_echo_n "checking for $compiler optio
620 # Instead, we relocate shared libraries at runtime. 755 # Instead, we relocate shared libraries at runtime.
621 ;; 756 ;;
622  757
623+ mint*) 758+ mint*)
624+ # Just because we use GCC doesn't mean we suddenly get shared libraries 759+ # Just because we use GCC doesn't mean we suddenly get shared libraries
625+ # on systems that don't support them. 760+ # on systems that don't support them.
626+ lt_prog_compiler_can_build_shared_FC=no 761+ lt_prog_compiler_can_build_shared_FC=no
627+ enable_shared=no 762+ enable_shared=no
628+ ;; 763+ ;;
629+ 764+
630 msdosdjgpp*) 765 msdosdjgpp*)
631 # Just because we use GCC doesn't mean we suddenly get shared libraries 766 # Just because we use GCC doesn't mean we suddenly get shared libraries
632 # on systems that don't support them. 767 # on systems that don't support them.
633@@ -18997,6 +19099,9 @@ $as_echo_n "checking for $compiler optio 768@@ -18997,6 +19180,9 @@ $as_echo_n "checking for $compiler optio
634  769
635 case $host_os in 770 case $host_os in
636 # For platforms which do not support PIC, -DPIC is meaningless: 771 # For platforms which do not support PIC, -DPIC is meaningless:
637+ mint*) 772+ mint*)
638+ lt_prog_compiler_pic_FC= 773+ lt_prog_compiler_pic_FC=
639+ ;; 774+ ;;
640 *djgpp*) 775 *djgpp*)
641 lt_prog_compiler_pic_FC= 776 lt_prog_compiler_pic_FC=
642 ;; 777 ;;
643@@ -19481,7 +19586,7 @@ _LT_EOF 778@@ -19395,6 +19581,11 @@ _LT_EOF
 779 fi
 780 ;;
 781
 782+ haiku*)
 783+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 784+ link_all_deplibs_FC=yes
 785+ ;;
 786+
 787 interix[3-9]*)
 788 hardcode_direct_FC=no
 789 hardcode_shlibpath_var_FC=no
 790@@ -19481,7 +19672,7 @@ _LT_EOF
644 ;; 791 ;;
645  792
646 netbsd*) 793 netbsd*)
647- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 794- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
648+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then 795+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
649 archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 796 archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
650 wlarc= 797 wlarc=
651 else 798 else
652@@ -19988,6 +20093,8 @@ rm -f core conftest.err conftest.$ac_obj 799@@ -19988,6 +20179,8 @@ rm -f core conftest.err conftest.$ac_obj
653 ;; 800 ;;
654  801
655 *nto* | *qnx*) 802 *nto* | *qnx*)
656+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 803+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
657+ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 804+ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
658 ;; 805 ;;
659  806
660 openbsd*) 807 openbsd*)
661@@ -20449,6 +20556,7 @@ beos*) 808@@ -20449,6 +20642,7 @@ beos*)
662 bsdi[45]*) 809 bsdi[45]*)
663 version_type=linux 810 version_type=linux
664 need_version=no 811 need_version=no
665+ need_lib_prefix=no 812+ need_lib_prefix=no
666 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 813 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
667 soname_spec='${libname}${release}${shared_ext}$major' 814 soname_spec='${libname}${release}${shared_ext}$major'
668 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' 815 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
669@@ -20549,9 +20657,7 @@ freebsd1*) 816@@ -20549,9 +20743,7 @@ freebsd1*)
670 dynamic_linker=no 817 dynamic_linker=no
671 ;; 818 ;;
672  819
673-freebsd* | dragonfly*) 820-freebsd* | dragonfly*)
674- # DragonFly does not have aout. When/if they implement a new 821- # DragonFly does not have aout. When/if they implement a new
675- # versioning mechanism, adjust this. 822- # versioning mechanism, adjust this.
676+freebsd*) 823+freebsd*)
677 if test -x /usr/bin/objformat; then 824 if test -x /usr/bin/objformat; then
678 objformat=`/usr/bin/objformat` 825 objformat=`/usr/bin/objformat`
679 else 826 else
680@@ -20563,7 +20669,7 @@ freebsd* | dragonfly*) 827@@ -20563,7 +20755,7 @@ freebsd* | dragonfly*)
681 version_type=freebsd-$objformat 828 version_type=freebsd-$objformat
682 case $version_type in 829 case $version_type in
683 freebsd-elf*) 830 freebsd-elf*)
684- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' 831- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
685+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 832+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
686 need_version=no 833 need_version=no
687 need_lib_prefix=no 834 need_lib_prefix=no
688 ;; 835 ;;
689@@ -20586,13 +20692,24 @@ freebsd* | dragonfly*) 836@@ -20586,13 +20778,24 @@ freebsd* | dragonfly*)
690 shlibpath_overrides_runpath=no 837 shlibpath_overrides_runpath=no
691 hardcode_into_libs=yes 838 hardcode_into_libs=yes
692 ;; 839 ;;
693- *) # from 4.6 on, and DragonFly 840- *) # from 4.6 on, and DragonFly
694+ *) # from 4.6 on 841+ *) # from 4.6 on
695 shlibpath_overrides_runpath=yes 842 shlibpath_overrides_runpath=yes
696 hardcode_into_libs=yes 843 hardcode_into_libs=yes
697 ;; 844 ;;
698 esac 845 esac
699 ;; 846 ;;
700  847
701+dragonfly*) 848+dragonfly*)
702+ version_type=linux 849+ version_type=linux
703+ need_version=no 850+ need_version=no
704+ need_lib_prefix=no 851+ need_lib_prefix=no
705+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 852+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
706+ soname_spec='${libname}${release}${shared_ext}$major' 853+ soname_spec='${libname}${release}${shared_ext}$major'
707+ shlibpath_var=LD_LIBRARY_PATH 854+ shlibpath_var=LD_LIBRARY_PATH
708+ shlibpath_overrides_runpath=no 855+ shlibpath_overrides_runpath=no
709+ hardcode_into_libs=yes 856+ hardcode_into_libs=yes
710+ ;; 857+ ;;
711+ 858+
712 gnu*) 859 gnu*)
713 version_type=linux 860 version_type=linux
714 need_lib_prefix=no 861 need_lib_prefix=no
715@@ -20664,12 +20781,7 @@ interix[3-9]*) 862@@ -20603,6 +20806,19 @@ gnu*)
 863 hardcode_into_libs=yes
 864 ;;
 865
 866+haiku*)
 867+ version_type=linux
 868+ need_lib_prefix=no
 869+ need_version=no
 870+ dynamic_linker="$host_os runtime_loader"
 871+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 872+ soname_spec='${libname}${release}${shared_ext}$major'
 873+ shlibpath_var=LIBRARY_PATH
 874+ shlibpath_overrides_runpath=yes
 875+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 876+ hardcode_into_libs=yes
 877+ ;;
 878+
 879 hpux9* | hpux10* | hpux11*)
 880 # Give a soname corresponding to the major version so that dld.sl refuses to
 881 # link against other versions.
 882@@ -20664,12 +20880,7 @@ interix[3-9]*)
716 irix5* | irix6* | nonstopux*) 883 irix5* | irix6* | nonstopux*)
717 case $host_os in 884 case $host_os in
718 nonstopux*) version_type=nonstopux ;; 885 nonstopux*) version_type=nonstopux ;;
719- *) 886- *)
720- if test "$lt_cv_prog_gnu_ld" = yes; then 887- if test "$lt_cv_prog_gnu_ld" = yes; then
721- version_type=linux 888- version_type=linux
722- else 889- else
723- version_type=irix 890- version_type=irix
724- fi ;; 891- fi ;;
725+ *) version_type=irix ;; 892+ *) version_type=irix ;;
726 esac 893 esac
727 need_lib_prefix=no 894 need_lib_prefix=no
728 need_version=no 895 need_version=no
729@@ -20754,15 +20866,14 @@ rm -f core conftest.err conftest.$ac_obj 896@@ -20754,15 +20965,14 @@ rm -f core conftest.err conftest.$ac_obj
730 ;; 897 ;;
731  898
732 netbsd*) 899 netbsd*)
733- version_type=sunos 900- version_type=sunos
734+ version_type=linux 901+ version_type=linux
735 need_lib_prefix=no 902 need_lib_prefix=no
736 need_version=no 903 need_version=no
737- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 904- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
738- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 905- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
739+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 906+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
740+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then 907+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
741 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 908 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
742 dynamic_linker='NetBSD (a.out) ld.so' 909 dynamic_linker='NetBSD (a.out) ld.so'
743 else 910 else
744- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 911- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
745 soname_spec='${libname}${release}${shared_ext}$major' 912 soname_spec='${libname}${release}${shared_ext}$major'
746 dynamic_linker='NetBSD ld.elf_so' 913 dynamic_linker='NetBSD ld.elf_so'
747 fi 914 fi
748@@ -20791,7 +20902,7 @@ newsos6) 915@@ -20791,7 +21001,7 @@ newsos6)
749 ;; 916 ;;
750  917
751 openbsd*) 918 openbsd*)
752- version_type=sunos 919- version_type=sunos
753+ version_type=linux 920+ version_type=linux
754 sys_lib_dlsearch_path_spec="/usr/lib" 921 sys_lib_dlsearch_path_spec="/usr/lib"
755 need_lib_prefix=no 922 need_lib_prefix=no
756 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. 923 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
757@@ -20799,7 +20910,7 @@ openbsd*) 924@@ -20799,7 +21009,7 @@ openbsd*)
758 openbsd3.3 | openbsd3.3.*) need_version=yes ;; 925 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
759 *) need_version=no ;; 926 *) need_version=no ;;
760 esac 927 esac
761- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 928- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
762+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 929+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
763 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 930 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
764 shlibpath_var=LD_LIBRARY_PATH 931 shlibpath_var=LD_LIBRARY_PATH
765 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 932 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
766@@ -21205,7 +21316,10 @@ for cc_temp in $compiler""; do 933@@ -21205,7 +21415,10 @@ for cc_temp in $compiler""; do
767 *) break;; 934 *) break;;
768 esac 935 esac
769 done 936 done
770-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 937-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
771+# Return the actual command name, not our pkgsrc wrapper name because several 938+# Return the actual command name, not our pkgsrc wrapper name because several
772+# decisions are made only based on compiler names 939+# decisions are made only based on compiler names
773+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi 940+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
774+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 941+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
775  942
776  943
777 # GCJ did not exist at the time GCC didn't implicitly link libc in. 944 # GCJ did not exist at the time GCC didn't implicitly link libc in.
778@@ -21320,9 +21434,11 @@ $as_echo_n "checking for $compiler optio 945@@ -21320,9 +21533,17 @@ $as_echo_n "checking for $compiler optio
779 ;; 946 ;;
780  947
781 darwin* | rhapsody*) 948 darwin* | rhapsody*)
782- # PIC is the default on this platform 949- # PIC is the default on this platform
783+ # PIC is the default on this platform, and static linking of 950+ # PIC is the default on this platform, and static linking of
784+ # binaries generally doesn't work 951+ # binaries generally doesn't work
785 # Common symbols not allowed in MH_DYLIB files 952 # Common symbols not allowed in MH_DYLIB files
786 lt_prog_compiler_pic_GCJ='-fno-common' 953 lt_prog_compiler_pic_GCJ='-fno-common'
787+ lt_prog_compiler_static_GCJ='' 954+ lt_prog_compiler_static_GCJ=''
 955+ ;;
 956+
 957+ haiku*)
 958+ # PIC is the default for Haiku.
 959+ # The "-static" flag exists, but is broken.
 960+ lt_prog_compiler_static_GCJ=
788 ;; 961 ;;
789  962
790 hpux*) 963 hpux*)
791@@ -21344,6 +21460,13 @@ $as_echo_n "checking for $compiler optio 964@@ -21344,6 +21565,13 @@ $as_echo_n "checking for $compiler optio
792 # Instead, we relocate shared libraries at runtime. 965 # Instead, we relocate shared libraries at runtime.
793 ;; 966 ;;
794  967
795+ mint*) 968+ mint*)
796+ # Just because we use GCC doesn't mean we suddenly get shared libraries 969+ # Just because we use GCC doesn't mean we suddenly get shared libraries
797+ # on systems that don't support them. 970+ # on systems that don't support them.
798+ lt_prog_compiler_can_build_shared_GCJ=no 971+ lt_prog_compiler_can_build_shared_GCJ=no
799+ enable_shared=no 972+ enable_shared=no
800+ ;; 973+ ;;
801+ 974+
802 msdosdjgpp*) 975 msdosdjgpp*)
803 # Just because we use GCC doesn't mean we suddenly get shared libraries 976 # Just because we use GCC doesn't mean we suddenly get shared libraries
804 # on systems that don't support them. 977 # on systems that don't support them.
805@@ -21541,6 +21664,9 @@ $as_echo_n "checking for $compiler optio 978@@ -21541,6 +21769,9 @@ $as_echo_n "checking for $compiler optio
806  979
807 case $host_os in 980 case $host_os in
808 # For platforms which do not support PIC, -DPIC is meaningless: 981 # For platforms which do not support PIC, -DPIC is meaningless:
809+ mint*) 982+ mint*)
810+ lt_prog_compiler_pic_GCJ= 983+ lt_prog_compiler_pic_GCJ=
811+ ;; 984+ ;;
812 *djgpp*) 985 *djgpp*)
813 lt_prog_compiler_pic_GCJ= 986 lt_prog_compiler_pic_GCJ=
814 ;; 987 ;;
815@@ -22025,7 +22151,7 @@ _LT_EOF 988@@ -21939,6 +22170,11 @@ _LT_EOF
 989 fi
 990 ;;
 991
 992+ haiku*)
 993+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 994+ link_all_deplibs_GCJ=yes
 995+ ;;
 996+
 997 interix[3-9]*)
 998 hardcode_direct_GCJ=no
 999 hardcode_shlibpath_var_GCJ=no
 1000@@ -22025,7 +22261,7 @@ _LT_EOF
816 ;; 1001 ;;
817  1002
818 netbsd*) 1003 netbsd*)
819- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 1004- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
820+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then 1005+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
821 archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 1006 archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
822 wlarc= 1007 wlarc=
823 else 1008 else
824@@ -22545,6 +22671,8 @@ rm -f core conftest.err conftest.$ac_obj 1009@@ -22545,6 +22781,8 @@ rm -f core conftest.err conftest.$ac_obj
825 ;; 1010 ;;
826  1011
827 *nto* | *qnx*) 1012 *nto* | *qnx*)
828+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 1013+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
829+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 1014+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
830 ;; 1015 ;;
831  1016
832 openbsd*) 1017 openbsd*)
833@@ -23115,7 +23243,10 @@ for cc_temp in $compiler""; do 1018@@ -23115,7 +23353,10 @@ for cc_temp in $compiler""; do
834 *) break;; 1019 *) break;;
835 esac 1020 esac
836 done 1021 done
837-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 1022-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
838+# Return the actual command name, not our pkgsrc wrapper name because several 1023+# Return the actual command name, not our pkgsrc wrapper name because several
839+# decisions are made only based on compiler names 1024+# decisions are made only based on compiler names
840+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi 1025+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
841+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 1026+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
842  1027
843 lt_cv_prog_compiler_c_o_RC=yes 1028 lt_cv_prog_compiler_c_o_RC=yes
844  1029
845@@ -24296,6 +24429,9 @@ LTCC='$LTCC' 1030@@ -24296,6 +24537,9 @@ LTCC='$LTCC'
846 LTCFLAGS='$LTCFLAGS' 1031 LTCFLAGS='$LTCFLAGS'
847 compiler='$compiler_DEFAULT' 1032 compiler='$compiler_DEFAULT'
848  1033
849+printf "%s" "$lt_prog_compiler_wl" > /dev/null 1034+printf "%s" "$lt_prog_compiler_wl" > /dev/null
850+printf "%s" "$lt_prog_compiler_no_builtin_flag" > /dev/null 1035+printf "%s" "$lt_prog_compiler_no_builtin_flag" > /dev/null
851+ 1036+
852 # Quote evaled strings. 1037 # Quote evaled strings.
853 for var in SED \ 1038 for var in SED \
854 GREP \ 1039 GREP \
855@@ -24580,6 +24716,9 @@ case \$lt_ECHO in 1040@@ -24580,6 +24824,9 @@ case \$lt_ECHO in
856 ;; 1041 ;;
857 esac 1042 esac
858  1043
859+printf "%s" "$lt_prog_compiler_wl" > /dev/null 1044+printf "%s" "$lt_prog_compiler_wl" > /dev/null
860+printf "%s" "$lt_prog_compiler_no_builtin_flag" > /dev/null 1045+printf "%s" "$lt_prog_compiler_no_builtin_flag" > /dev/null
861+ 1046+
862 ac_aux_dir='$ac_aux_dir' 1047 ac_aux_dir='$ac_aux_dir'
863 xsi_shell='$xsi_shell' 1048 xsi_shell='$xsi_shell'
864 lt_shell_append='$lt_shell_append' 1049 lt_shell_append='$lt_shell_append'
cvs diff -r1.24 -r1.25 pkgsrc/devel/libtool/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/libtool/patches/Attic/patch-ac 2009/12/15 17:35:37 1.24
+++ pkgsrc/devel/libtool/patches/Attic/patch-ac 2011/03/23 15:46:36 1.25
@@ -1,17 +1,35 @@ @@ -1,17 +1,35 @@
1$NetBSD: patch-ac,v 1.24 2009/12/15 17:35:37 joerg Exp $ 1$NetBSD: patch-ac,v 1.25 2011/03/23 15:46:36 obache Exp $
2 2
3--- libltdl/config/ltmain.sh.orig 2009-11-16 14:23:18.000000000 +0100 3--- libltdl/config/ltmain.sh.orig 2009-11-16 13:23:18.000000000 +0000
4+++ libltdl/config/ltmain.sh 4+++ libltdl/config/ltmain.sh
5@@ -111,9 +111,9 @@ done 5@@ -111,9 +111,9 @@ done
6 $lt_unset CDPATH 6 $lt_unset CDPATH
7  7
8  8
9- 9-
10- 10-
11- 11-
12+unset CP 12+unset CP
13+unset MV 13+unset MV
14+unset RM 14+unset RM
15 : ${CP="cp -f"} 15 : ${CP="cp -f"}
16 : ${ECHO="echo"} 16 : ${ECHO="echo"}
17 : ${EGREP="/bin/grep -E"} 17 : ${EGREP="/bin/grep -E"}
 18@@ -4522,7 +4522,7 @@ func_mode_link ()
 19 -l*)
 20 if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 21 case $host in
 22- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
 23+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 24 # These systems don't actually have a C or math library (as such)
 25 continue
 26 ;;
 27@@ -6476,7 +6476,7 @@ func_mode_link ()
 28 if test "$build_libtool_libs" = yes; then
 29 if test -n "$rpath"; then
 30 case $host in
 31- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
 32+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
 33 # these systems don't actually have a c library (as such)!
 34 ;;
 35 *-*-rhapsody* | *-*-darwin1.[012])
cvs diff -r1.37 -r1.38 pkgsrc/devel/libtool/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/libtool/patches/Attic/patch-ad 2009/12/17 00:53:52 1.37
+++ pkgsrc/devel/libtool/patches/Attic/patch-ad 2011/03/23 15:46:36 1.38
@@ -1,198 +1,247 @@ @@ -1,198 +1,247 @@
1$NetBSD: patch-ad,v 1.37 2009/12/17 00:53:52 joerg Exp $ 1$NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
2 2
3--- libltdl/configure.orig 2009-12-17 01:29:59.000000000 +0100 3--- libltdl/configure.orig 2010-06-19 07:24:26.000000000 +0000
4+++ libltdl/configure 4+++ libltdl/configure
5@@ -4542,6 +4542,13 @@ else 5@@ -4542,6 +4542,13 @@ else
6 lt_cv_sys_max_cmd_len=8192; 6 lt_cv_sys_max_cmd_len=8192;
7 ;; 7 ;;
8  8
9+ mint*) 9+ mint*)
10+ # On MiNT we can support fairly large cmd lengths, but it takes 10+ # On MiNT we can support fairly large cmd lengths, but it takes
11+ # a while to run the tests, so let's restrict it to something 11+ # a while to run the tests, so let's restrict it to something
12+ # reasonable. 12+ # reasonable.
13+ lt_cv_sys_max_cmd_len=8192; 13+ lt_cv_sys_max_cmd_len=8192;
14+ ;; 14+ ;;
15+ 15+
16 amigaos*) 16 amigaos*)
17 # On AmigaOS with pdksh, this test takes hours, literally. 17 # On AmigaOS with pdksh, this test takes hours, literally.
18 # So we just punt and use a minimum line length of 8192. 18 # So we just punt and use a minimum line length of 8192.
19@@ -4967,7 +4974,7 @@ newos6*) 19@@ -4914,6 +4921,10 @@ gnu*)
 20 lt_cv_deplibs_check_method=pass_all
 21 ;;
 22
 23+haiku*)
 24+ lt_cv_deplibs_check_method=pass_all
 25+ ;;
 26+
 27 hpux10.20* | hpux11*)
 28 lt_cv_file_magic_cmd=/usr/bin/file
 29 case $host_cpu in
 30@@ -4967,7 +4978,7 @@ newos6*)
20 ;; 31 ;;
21  32
22 *nto* | *qnx*) 33 *nto* | *qnx*)
23- lt_cv_deplibs_check_method=pass_all 34- lt_cv_deplibs_check_method=pass_all
24+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$' 35+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$'
25 ;; 36 ;;
26  37
27 openbsd*) 38 openbsd*)
28@@ -7286,7 +7293,10 @@ for cc_temp in $compiler""; do 39@@ -7286,7 +7297,10 @@ for cc_temp in $compiler""; do
29 *) break;; 40 *) break;;
30 esac 41 esac
31 done 42 done
32-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 43-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
33+# Return the actual command name, not our pkgsrc wrapper name because several 44+# Return the actual command name, not our pkgsrc wrapper name because several
34+# decisions are made only based on compiler names 45+# decisions are made only based on compiler names
35+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi 46+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
36+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 47+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
37  48
38  49
39 # Only perform the check for file, if the check method requires it 50 # Only perform the check for file, if the check method requires it
40@@ -7596,9 +7606,11 @@ $as_echo_n "checking for $compiler optio 51@@ -7596,9 +7610,17 @@ $as_echo_n "checking for $compiler optio
41 ;; 52 ;;
42  53
43 darwin* | rhapsody*) 54 darwin* | rhapsody*)
44- # PIC is the default on this platform 55- # PIC is the default on this platform
45+ # PIC is the default on this platform, and static linking of 56+ # PIC is the default on this platform, and static linking of
46+ # binaries generally doesn't work 57+ # binaries generally doesn't work
47 # Common symbols not allowed in MH_DYLIB files 58 # Common symbols not allowed in MH_DYLIB files
48 lt_prog_compiler_pic='-fno-common' 59 lt_prog_compiler_pic='-fno-common'
49+ lt_prog_compiler_static='' 60+ lt_prog_compiler_static=''
 61+ ;;
 62+
 63+ haiku*)
 64+ # PIC is the default for Haiku.
 65+ # The "-static" flag exists, but is broken.
 66+ lt_prog_compiler_static=
50 ;; 67 ;;
51  68
52 hpux*) 69 hpux*)
53@@ -7620,6 +7632,13 @@ $as_echo_n "checking for $compiler optio 70@@ -7620,6 +7642,13 @@ $as_echo_n "checking for $compiler optio
54 # Instead, we relocate shared libraries at runtime. 71 # Instead, we relocate shared libraries at runtime.
55 ;; 72 ;;
56  73
57+ mint*) 74+ mint*)
58+ # Just because we use GCC doesn't mean we suddenly get shared libraries 75+ # Just because we use GCC doesn't mean we suddenly get shared libraries
59+ # on systems that don't support them. 76+ # on systems that don't support them.
60+ lt_prog_compiler_can_build_shared=no 77+ lt_prog_compiler_can_build_shared=no
61+ enable_shared=no 78+ enable_shared=no
62+ ;; 79+ ;;
63+ 80+
64 msdosdjgpp*) 81 msdosdjgpp*)
65 # Just because we use GCC doesn't mean we suddenly get shared libraries 82 # Just because we use GCC doesn't mean we suddenly get shared libraries
66 # on systems that don't support them. 83 # on systems that don't support them.
67@@ -7817,6 +7836,9 @@ $as_echo_n "checking for $compiler optio 84@@ -7817,6 +7846,9 @@ $as_echo_n "checking for $compiler optio
68  85
69 case $host_os in 86 case $host_os in
70 # For platforms which do not support PIC, -DPIC is meaningless: 87 # For platforms which do not support PIC, -DPIC is meaningless:
71+ mint*) 88+ mint*)
72+ lt_prog_compiler_pic= 89+ lt_prog_compiler_pic=
73+ ;; 90+ ;;
74 *djgpp*) 91 *djgpp*)
75 lt_prog_compiler_pic= 92 lt_prog_compiler_pic=
76 ;; 93 ;;
77@@ -8316,7 +8338,7 @@ _LT_EOF 94@@ -8230,6 +8262,11 @@ _LT_EOF
 95 fi
 96 ;;
 97
 98+ haiku*)
 99+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 100+ link_all_deplibs=yes
 101+ ;;
 102+
 103 interix[3-9]*)
 104 hardcode_direct=no
 105 hardcode_shlibpath_var=no
 106@@ -8316,7 +8353,7 @@ _LT_EOF
78 ;; 107 ;;
79  108
80 netbsd*) 109 netbsd*)
81- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 110- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
82+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then 111+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
83 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 112 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
84 wlarc= 113 wlarc=
85 else 114 else
86@@ -8836,6 +8858,8 @@ rm -f core conftest.err conftest.$ac_obj 115@@ -8836,6 +8873,8 @@ rm -f core conftest.err conftest.$ac_obj
87 ;; 116 ;;
88  117
89 *nto* | *qnx*) 118 *nto* | *qnx*)
90+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 119+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
91+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 120+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
92 ;; 121 ;;
93  122
94 openbsd*) 123 openbsd*)
95@@ -9450,6 +9474,7 @@ beos*) 124@@ -9450,6 +9489,7 @@ beos*)
96 bsdi[45]*) 125 bsdi[45]*)
97 version_type=linux 126 version_type=linux
98 need_version=no 127 need_version=no
99+ need_lib_prefix=no 128+ need_lib_prefix=no
100 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 129 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
101 soname_spec='${libname}${release}${shared_ext}$major' 130 soname_spec='${libname}${release}${shared_ext}$major'
102 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' 131 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
103@@ -9551,9 +9576,7 @@ freebsd1*) 132@@ -9551,9 +9591,7 @@ freebsd1*)
104 dynamic_linker=no 133 dynamic_linker=no
105 ;; 134 ;;
106  135
107-freebsd* | dragonfly*) 136-freebsd* | dragonfly*)
108- # DragonFly does not have aout. When/if they implement a new 137- # DragonFly does not have aout. When/if they implement a new
109- # versioning mechanism, adjust this. 138- # versioning mechanism, adjust this.
110+freebsd*) 139+freebsd*)
111 if test -x /usr/bin/objformat; then 140 if test -x /usr/bin/objformat; then
112 objformat=`/usr/bin/objformat` 141 objformat=`/usr/bin/objformat`
113 else 142 else
114@@ -9565,7 +9588,7 @@ freebsd* | dragonfly*) 143@@ -9565,7 +9603,7 @@ freebsd* | dragonfly*)
115 version_type=freebsd-$objformat 144 version_type=freebsd-$objformat
116 case $version_type in 145 case $version_type in
117 freebsd-elf*) 146 freebsd-elf*)
118- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' 147- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
119+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 148+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
120 need_version=no 149 need_version=no
121 need_lib_prefix=no 150 need_lib_prefix=no
122 ;; 151 ;;
123@@ -9588,13 +9611,24 @@ freebsd* | dragonfly*) 152@@ -9588,13 +9626,24 @@ freebsd* | dragonfly*)
124 shlibpath_overrides_runpath=no 153 shlibpath_overrides_runpath=no
125 hardcode_into_libs=yes 154 hardcode_into_libs=yes
126 ;; 155 ;;
127- *) # from 4.6 on, and DragonFly 156- *) # from 4.6 on, and DragonFly
128+ *) # from 4.6 on 157+ *) # from 4.6 on
129 shlibpath_overrides_runpath=yes 158 shlibpath_overrides_runpath=yes
130 hardcode_into_libs=yes 159 hardcode_into_libs=yes
131 ;; 160 ;;
132 esac 161 esac
133 ;; 162 ;;
134  163
135+dragonfly*) 164+dragonfly*)
136+ version_type=linux 165+ version_type=linux
137+ need_version=no 166+ need_version=no
138+ need_lib_prefix=no 167+ need_lib_prefix=no
139+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 168+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
140+ soname_spec='${libname}${release}${shared_ext}$major' 169+ soname_spec='${libname}${release}${shared_ext}$major'
141+ shlibpath_var=LD_LIBRARY_PATH 170+ shlibpath_var=LD_LIBRARY_PATH
142+ shlibpath_overrides_runpath=no 171+ shlibpath_overrides_runpath=no
143+ hardcode_into_libs=yes 172+ hardcode_into_libs=yes
144+ ;; 173+ ;;
145+ 174+
146 gnu*) 175 gnu*)
147 version_type=linux 176 version_type=linux
148 need_lib_prefix=no 177 need_lib_prefix=no
149@@ -9666,12 +9700,7 @@ interix[3-9]*) 178@@ -9605,6 +9654,19 @@ gnu*)
 179 hardcode_into_libs=yes
 180 ;;
 181
 182+haiku*)
 183+ version_type=linux
 184+ need_lib_prefix=no
 185+ need_version=no
 186+ dynamic_linker="$host_os runtime_loader"
 187+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 188+ soname_spec='${libname}${release}${shared_ext}$major'
 189+ shlibpath_var=LIBRARY_PATH
 190+ shlibpath_overrides_runpath=yes
 191+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 192+ hardcode_into_libs=yes
 193+ ;;
 194+
 195 hpux9* | hpux10* | hpux11*)
 196 # Give a soname corresponding to the major version so that dld.sl refuses to
 197 # link against other versions.
 198@@ -9666,12 +9728,7 @@ interix[3-9]*)
150 irix5* | irix6* | nonstopux*) 199 irix5* | irix6* | nonstopux*)
151 case $host_os in 200 case $host_os in
152 nonstopux*) version_type=nonstopux ;; 201 nonstopux*) version_type=nonstopux ;;
153- *) 202- *)
154- if test "$lt_cv_prog_gnu_ld" = yes; then 203- if test "$lt_cv_prog_gnu_ld" = yes; then
155- version_type=linux 204- version_type=linux
156- else 205- else
157- version_type=irix 206- version_type=irix
158- fi ;; 207- fi ;;
159+ *) version_type=irix ;; 208+ *) version_type=irix ;;
160 esac 209 esac
161 need_lib_prefix=no 210 need_lib_prefix=no
162 need_version=no 211 need_version=no
163@@ -9762,15 +9791,14 @@ rm -f core conftest.err conftest.$ac_obj 212@@ -9762,15 +9819,14 @@ rm -f core conftest.err conftest.$ac_obj
164 ;; 213 ;;
165  214
166 netbsd*) 215 netbsd*)
167- version_type=sunos 216- version_type=sunos
168+ version_type=linux 217+ version_type=linux
169 need_lib_prefix=no 218 need_lib_prefix=no
170 need_version=no 219 need_version=no
171+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 220+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
172 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 221 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
173- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 222- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
174 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 223 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
175 dynamic_linker='NetBSD (a.out) ld.so' 224 dynamic_linker='NetBSD (a.out) ld.so'
176 else 225 else
177- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 226- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
178 soname_spec='${libname}${release}${shared_ext}$major' 227 soname_spec='${libname}${release}${shared_ext}$major'
179 dynamic_linker='NetBSD ld.elf_so' 228 dynamic_linker='NetBSD ld.elf_so'
180 fi 229 fi
181@@ -9799,7 +9827,7 @@ newsos6) 230@@ -9799,7 +9855,7 @@ newsos6)
182 ;; 231 ;;
183  232
184 openbsd*) 233 openbsd*)
185- version_type=sunos 234- version_type=sunos
186+ version_type=linux 235+ version_type=linux
187 sys_lib_dlsearch_path_spec="/usr/lib" 236 sys_lib_dlsearch_path_spec="/usr/lib"
188 need_lib_prefix=no 237 need_lib_prefix=no
189 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. 238 # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
190@@ -9807,7 +9835,7 @@ openbsd*) 239@@ -9807,7 +9863,7 @@ openbsd*)
191 openbsd3.3 | openbsd3.3.*) need_version=yes ;; 240 openbsd3.3 | openbsd3.3.*) need_version=yes ;;
192 *) need_version=no ;; 241 *) need_version=no ;;
193 esac 242 esac
194- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 243- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
195+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 244+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
196 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' 245 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
197 shlibpath_var=LD_LIBRARY_PATH 246 shlibpath_var=LD_LIBRARY_PATH
198 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 247 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then