From 12bb2cad8e2982bd842d168158e391d6c12fb6a3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 9 Jan 2025 13:19:35 +0900 Subject: Remove support for SCOv3 Signed-off-by: Michele Calgaro --- acinclude.m4.in | 2 +- config.sub | 22 +--------------------- libtool.m4.in | 46 +++++++++++----------------------------------- ltmain.sh | 10 +--------- 4 files changed, 14 insertions(+), 66 deletions(-) diff --git a/acinclude.m4.in b/acinclude.m4.in index 70e65ae..c75d383 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -4751,7 +4751,7 @@ AC_LANG_RESTORE ]) dnl ------------------------------------------------------------------------ -dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org +dnl Check for S_ISSOCK macro dnl ------------------------------------------------------------------------ dnl AC_DEFUN([AC_CHECK_S_ISSOCK], diff --git a/config.sub b/config.sub index 299e8f8..279ffd6 100755 --- a/config.sub +++ b/config.sub @@ -171,26 +171,6 @@ case $os in -hiux*) os=-hiuxwe2 ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -1160,7 +1140,7 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -luna* | -dgux* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* \ diff --git a/libtool.m4.in b/libtool.m4.in index 8c5b975..d4834bd 100644 --- a/libtool.m4.in +++ b/libtool.m4.in @@ -1316,19 +1316,6 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) rm -rf conftest* ;; -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1552,10 +1539,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) + sysv5* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` @@ -2617,7 +2601,7 @@ sysv4*MP*) fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +sysv5* | unixware* | OpenUNIX* | sysv4*uw2*) version_type=freebsd-elf need_lib_prefix=no need_version=no @@ -2630,11 +2614,6 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac fi sys_lib_dlsearch_path_spec='/usr/lib' ;; @@ -3098,7 +3077,7 @@ solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +sysv5* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; @@ -3322,13 +3301,10 @@ irix* | nonstopux*) solaris*) symcode='[[BDRT]]' ;; -sco3.2v5*) - symcode='[[DT]]' - ;; sysv4.2uw2*) symcode='[[DT]]' ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) +sysv5* | unixware* | OpenUNIX*) symcode='[[ABDT]]' ;; sysv4) @@ -3777,7 +3753,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + sysv5* | unixware* | OpenUNIX*) case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4039,7 +4015,7 @@ m4_if([$1], [CXX], [ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + sysv5* | unixware* | OpenUNIX*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -4418,7 +4394,7 @@ _LT_EOF fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + sysv5* | unixware* | OpenUNIX*) case `$LD -v 2>&1` in *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) _LT_TAGVAR(ld_shlibs, $1)=no @@ -4952,7 +4928,7 @@ _LT_EOF fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4967,7 +4943,7 @@ _LT_EOF fi ;; - sysv5* | sco3.2v5* | sco5v6*) + sysv5*) # Note: We can NOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would @@ -6074,7 +6050,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6092,7 +6068,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - sysv5* | sco3.2v5* | sco5v6*) + sysv5*) # Note: We can NOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would diff --git a/ltmain.sh b/ltmain.sh index f3ff7c7..b26610f 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -93,7 +93,7 @@ DUALCASE=1; export DUALCASE # for MKS sh # NLS nuisances: We save the old values to restore during execute mode. # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). +# e.g. LANG=C. lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -4532,10 +4532,6 @@ func_mode_link () deplibs="$deplibs System.ltframework" continue ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work test "X$arg" = "X-lc" && continue @@ -5659,7 +5655,6 @@ func_mode_link () if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; *-*-sysv4*uw2*) add_dir="-L$dir" ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ *-*-unixware7*) add_dir="-L$dir" ;; @@ -6461,9 +6456,6 @@ func_mode_link () *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work ;; -- cgit v1.2.3