On Mon, 26 Sep 2005, Ralf Wildenhues wrote:
> Hi Tim,
>
> * Tim Rice wrote on Mon, Sep 26, 2005 at 10:45:29PM CEST:
> > On Mon, 26 Sep 2005, Ralf Wildenhues wrote:
> > > * Tim Rice wrote on Mon, Sep 26, 2005 at 08:41:21PM CEST:
>
> > > > All UnixWare 2.x versions (and 1.x) are sysv4.2, so the sysv4*uw2 entry
> > > > becomes redundant.
> > >
> > > Well, I _was_ cheating a bit:
> > > http://lists.gnu.org/archive/html/bug-libtool/2005-09/msg00013.html
> > > http://lists.gnu.org/archive/html/libtool-patches/2005-09/msg00036.html
> > > (be sure to look through both threads -- I installed a bogus patch first,
> > > stumbling over this exact same issue ;-)
> >
> > And I made the same mistake (sysv4*uw2/sysv4.2*uw2) in
> > http://lists.gnu.org/archive/html/libtool-patches/2004-10/msg00012.html
> >
> > OK, so we don't need to worry about sysv4*uw2 as all UnixWare 2 are
> > sysv4.2
>
> Good thing we got that sorted out. ;-)
>
> Could you -- in light of this -- repost your patch, so we can apply it?
> (Or test CVS HEAD first and then repost; whatever suits you best.)
> A ChangeLog entry would be nice, but I'll happily write one for you,
> too. :)
Ok, here it is including an attempt at a ChangeLog entry.
>
> Thank you,
> Ralf
>
>
>
>
--
Tim Rice Multitalents (707) 887-1469
[EMAIL PROTECTED]
--- libtool-1.5/ChangeLog.old 2005-09-25 09:00:18.000000000 -0700
+++ libtool-1.5/ChangeLog 2005-09-26 15:54:26.944777219 -0700
@@ -1,3 +1,12 @@
+2005-09-26 Tim Rice <[EMAIL PROTECTED]>
+
+ * libtool.m4 (AC_DEPLIBS_CHECK_METHOD, AC_LIBTOOL_SYS_DYNAMIC_LINKER)
+ (AC_LIBTOOL_LANG_CXX_CONFIG, AC_LIBTOOL_PROG_COMPILER_PIC)
+ (AC_LIBTOOL_PROG_LD_SHLIBS):
+ * ltdl.m4 (AC_LTDL_SYS_DLOPEN_DEPLIBS):
+ Get UnixWare 7.1.[34] and OpenServer 6 fully working.
+ Improve other UnixWare versions a little.
+
2005-09-25 Alan W. Irwin <[EMAIL PROTECTED]>,
Ralf Wildenhues <[EMAIL PROTECTED]>
--- libtool-1.5/libtool.m4.old 2005-09-22 16:59:00.000000000 -0700
+++ libtool-1.5/libtool.m4 2005-09-26 15:31:57.164617030 -0700
@@ -1655,7 +1655,7 @@
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.2uw2* | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -1688,6 +1688,19 @@
fi
;;
+sysv5*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2314,11 +2327,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.2uw2* | sysv4.3*)
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB
(shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
@@ -2339,10 +2348,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
;;
-sysv4*uw2* | unixware7*)
+unixware7* | sysv5*)
lt_cv_deplibs_check_method=pass_all
;;
esac
@@ -3559,8 +3571,29 @@
;;
esac
;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ sysv5OpenUNIX8* | sysv5UnixWare7.[[01]].[[01]]* | sysv5uw[[78]]* |
unixware7*)
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib
$libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ runpath_var='LD_RUN_PATH'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+ esac
+ ;;
+ sysv5*)
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib
$libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ runpath_var='LD_RUN_PATH'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+ esac
;;
tandem*)
case $cc_basename in
@@ -4949,7 +4982,14 @@
;;
esac
;;
- unixware*)
+ unixware* | sysv5*)
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
;;
vxworks*)
;;
@@ -5966,27 +6006,30 @@
runpath_var=LD_RUN_PATH
;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+ sysv5OpenUNIX8* | sysv5UnixWare7.[[01]].[[10]]* | sysv5uw[[78]]* |
unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o
$lib $libobjs $deplibs $compiler_flags'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib
$libobjs $deplibs $compiler_flags'
fi
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
sysv5*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h
$soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat
$export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >>
$lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib
$libobjs $deplibs $linker_flags~$rm $lib.exp'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o
$lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib
$libobjs $deplibs $compiler_flags'
+ fi
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
runpath_var='LD_RUN_PATH'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
uts4*)
--- libtool-1.5/ltdl.m4.old 2005-04-29 01:56:01.000000000 -0700
+++ libtool-1.5/ltdl.m4 2005-09-25 09:15:56.813893005 -0700
@@ -175,6 +175,9 @@
solaris*)
libltdl_cv_sys_dlopen_deplibs=yes
;;
+ sysv5*)
+ libltdl_cv_sys_dlopen_deplibs=yes
+ ;;
esac
])
if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then