Add cases to match 'mint'

This commit is contained in:
abs 2009-02-24 10:13:26 +00:00
parent 97df9832a6
commit a4f8387182

View file

@ -1,4 +1,4 @@
$NetBSD: manual-libtool.m4,v 1.23 2008/11/19 01:26:52 chuck Exp $
$NetBSD: manual-libtool.m4,v 1.24 2009/02/24 10:13:26 abs Exp $
Local pkgsrc changes:
- override the basename to point to the actual backend compiler,
@ -9,8 +9,8 @@ Local pkgsrc changes:
- Interix3 support
- disable static linkage on OS X by default
--- libtool.m4.orig 2008-02-01 11:26:47.000000000 -0500
+++ libtool.m4 2008-11-18 16:37:04.000000000 -0500
--- libtool.m4.orig 2008-02-01 16:26:47.000000000 +0000
+++ libtool.m4 2009-02-21 23:20:30.000000000 +0000
@@ -249,7 +249,10 @@
*) break;;
esac
@ -37,7 +37,21 @@ Local pkgsrc changes:
elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
test "X$CONFIG_SHELL" != X/bin/ksh; then
# If we have ksh, try running configure again with it.
@@ -1427,6 +1430,7 @@
@@ -820,6 +823,13 @@
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT we can support fairly large cmd lengths, but it takes
+ # a while to run the tests, so let's restrict it to something
+ # reasonable.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -1427,6 +1437,7 @@
bsdi[[45]]*)
version_type=linux
need_version=no
@ -45,7 +59,7 @@ Local pkgsrc changes:
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
@@ -1525,7 +1529,7 @@
@@ -1525,7 +1536,7 @@
dynamic_linker=no
;;
@ -54,7 +68,7 @@ Local pkgsrc changes:
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
@@ -1539,7 +1543,7 @@
@@ -1539,7 +1550,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@ -63,7 +77,7 @@ Local pkgsrc changes:
need_version=no
need_lib_prefix=no
;;
@@ -1569,6 +1573,16 @@
@@ -1569,6 +1580,16 @@
esac
;;
@ -80,7 +94,7 @@ Local pkgsrc changes:
gnu*)
version_type=linux
need_lib_prefix=no
@@ -1637,15 +1651,22 @@
@@ -1637,15 +1658,22 @@
hardcode_into_libs=yes
;;
@ -109,7 +123,7 @@ Local pkgsrc changes:
esac
need_lib_prefix=no
need_version=no
@@ -1710,11 +1731,11 @@
@@ -1710,11 +1738,11 @@
;;
netbsd*)
@ -123,7 +137,7 @@ Local pkgsrc changes:
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -1739,13 +1760,14 @@
@@ -1739,13 +1767,14 @@
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@ -139,7 +153,7 @@ Local pkgsrc changes:
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@ -1753,7 +1775,7 @@
@@ -1753,7 +1782,7 @@
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@ -148,7 +162,7 @@ Local pkgsrc changes:
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1954,9 +1976,7 @@
@@ -1954,9 +1983,7 @@
case $tagname in
CXX)
@ -159,7 +173,7 @@ Local pkgsrc changes:
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
@@ -2475,6 +2495,10 @@
@@ -2475,6 +2502,10 @@
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
@ -170,7 +184,7 @@ Local pkgsrc changes:
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
@@ -2505,7 +2529,7 @@
@@ -2505,7 +2536,7 @@
;;
nto-qnx*)
@ -179,7 +193,7 @@ Local pkgsrc changes:
;;
openbsd*)
@@ -2712,21 +2736,10 @@
@@ -2712,21 +2743,10 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@ -202,7 +216,7 @@ Local pkgsrc changes:
# AC_LIBTOOL_F77
# --------------
@@ -2864,7 +2877,7 @@
@@ -2864,7 +2884,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@ -211,7 +225,7 @@ Local pkgsrc changes:
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -3350,6 +3363,16 @@
@@ -3350,6 +3370,16 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@ -228,7 +242,7 @@ Local pkgsrc changes:
irix5* | irix6*)
case $cc_basename in
CC*)
@@ -3503,14 +3526,29 @@
@@ -3503,14 +3533,29 @@
;;
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@ -260,7 +274,7 @@ Local pkgsrc changes:
;;
openbsd2*)
# C++ shared libraries are fairly broken
@@ -3823,6 +3861,11 @@
@@ -3823,6 +3868,11 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@ -272,7 +286,7 @@ Local pkgsrc changes:
*)
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3985,6 +4028,21 @@
@@ -3985,6 +4035,21 @@
esac
done
@ -294,7 +308,7 @@ Local pkgsrc changes:
# Clean up.
rm -f a.out a.exe
else
@@ -5033,9 +5091,11 @@
@@ -5033,9 +5098,15 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
@ -304,10 +318,14 @@ Local pkgsrc changes:
# Common symbols not allowed in MH_DYLIB files
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
+ ;;
+ *mint*)
+ # FreeMiNT does not support shared libraries at all
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
*djgpp*)
# DJGPP does not support shared libraries at all
@@ -5061,6 +5121,10 @@
@@ -5061,6 +5132,10 @@
;;
esac
;;
@ -318,7 +336,17 @@ Local pkgsrc changes:
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
@@ -5139,6 +5203,8 @@
@@ -5107,6 +5182,9 @@
;;
esac
;;
+ mint*)
+ # FreeMiNT uses GNU C++
+ ;;
freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
@@ -5139,6 +5217,8 @@
# This is c89, which is MS Visual C++ (no shared libs)
# Anyone wants to do a port?
;;
@ -327,7 +355,7 @@ Local pkgsrc changes:
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC*)
@@ -5278,6 +5344,8 @@
@@ -5278,6 +5358,8 @@
;;
vxworks*)
;;
@ -336,7 +364,7 @@ Local pkgsrc changes:
*)
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
;;
@@ -5319,9 +5387,11 @@
@@ -5319,9 +5401,11 @@
;;
darwin* | rhapsody*)
@ -349,7 +377,21 @@ Local pkgsrc changes:
;;
interix[[3-9]]*)
@@ -5355,6 +5425,11 @@
@@ -5329,6 +5413,13 @@
# Instead, we relocate shared libraries at runtime.
;;
+ mint*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ enable_shared=no
+ ;;
+
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -5355,6 +5446,11 @@
esac
;;
@ -361,7 +403,7 @@ Local pkgsrc changes:
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
@@ -5510,6 +5585,10 @@
@@ -5510,6 +5606,10 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@ -372,7 +414,17 @@ Local pkgsrc changes:
*)
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
;;
@@ -5791,6 +5870,17 @@
@@ -5534,6 +5634,9 @@
fi
case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
+ mint*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -5791,6 +5894,17 @@
fi
;;
@ -390,7 +442,7 @@ Local pkgsrc changes:
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -5856,6 +5946,11 @@
@@ -5856,6 +5970,11 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@ -402,7 +454,7 @@ Local pkgsrc changes:
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -6210,6 +6305,21 @@
@@ -6210,6 +6329,21 @@
fi
;;
@ -424,7 +476,7 @@ Local pkgsrc changes:
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -6435,6 +6545,13 @@
@@ -6435,6 +6569,13 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;