Skip to content

M
MariaDB
Commit e39aaf80 authored by unknown's avatar unknown
Browse files
Options

Update the SCO (now Caldera)/SysV tests. This should allow OpenUnix8 

to work automatically.  Thanks to Boyd Lynn Gerber for the patch.
parent bfe2213b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 106 deletions
config.guess
View file @ e39aaf80
...@@ -790,7 +790,7 @@ EOF ...@@ -790,7 +790,7 @@ EOF
i?86:DYNIX/ptx:4*:*) i?86:DYNIX/ptx:4*:*)
echo i386-sequent-sysv4 echo i386-sequent-sysv4
exit 0 ;; exit 0 ;;
i?86:UNIX_SV:4.2MP:2.*) i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version # Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2... # number series starting with 2...
# I am not positive that other SVR4 systems won't match this, # I am not positive that other SVR4 systems won't match this,
...@@ -798,64 +798,24 @@ EOF ...@@ -798,64 +798,24 @@ EOF
# Use sysv4.2uw... so that sysv4* matches it. # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;; exit 0 ;;
i?86:UnixWare:5:7) # Unixware 7.0.0t (uname -v reports 7) has native threads i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
# uname -m incorrectly reports CPU type (uname -m reports i386 always) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
# compiler supports following optimization flags:i386,i486,pentium,pentium_pro and blended
# compiler does NOT support: i586,i686,Pentium,Pentium Pro,pentiumpro,pentium_II or Pentium II
if /bin/uname machine 2>/dev/null >/dev/null ; then
(/bin/uname machine|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname machine|egrep 'Pentium' >/dev/null) && UNAME_MACHINE=pentium
(/bin/uname machine|egrep 'Pentium Pro' >/dev/null) && UNAME_MACHINE=pentium_pro
(/bin/uname machine|egrep 'Pentium II' >/dev/null) && UNAME_MACHINE=pentium_II
echo ${UNAME_MACHINE}-pc-unixware7.0.0
else
echo ${UNAME_MACHINE}-pc-unixware7.0.0
fi
exit 0 ;;
i?86:UnixWare:5:7.0.1) # Unixware 7.0.1 (uname -v reports 7.0.1) has POSIX threads
# uname -m incorrectly reports CPU type (uname -m reports i386 always)
# compiler supports following optimization flags:i386,i486,pentium,pentium_pro and blended
# compiler does NOT support: i586,i686,Pentium,Pentium Pro,pentiumpro,pentium_II or Pentium II
if /bin/uname machine 2>/dev/null >/dev/null ; then
(/bin/uname machine|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname machine|egrep 'Pentium' >/dev/null) && UNAME_MACHINE=pentium
(/bin/uname machine|egrep 'Pentium Pro' >/dev/null) && UNAME_MACHINE=pentium_pro
(/bin/uname machine|egrep 'Pentium II' >/dev/null) && UNAME_MACHINE=pentium_II
echo ${UNAME_MACHINE}-pc-unixware7.0.1
else
echo ${UNAME_MACHINE}-pc-unixware7.0.1
fi
exit 0 ;;
# SysVr5/Unixware7
i?86:*:5*:* | i?86:SYSTEM_V:5*:*)
if uname -a | grep SCO >/dev/null 2>/dev/null ; then
(/bin/uname -s|egrep UnixWare >/dev/null) && UNAME_VER=uw${UNAME_VERSION}
if /bin/uname -X 2>/dev/null >/dev/null ; then
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
fi
echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}${UNAME_VER}
else
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
fi
exit 0 ;;
i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
else else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi fi
exit 0 ;; exit 0 ;;
i?86:*:5:7*) i*86:*:5:[78]*)
UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` case `/bin/uname -X | grep "^Machine"` in
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 *486*) UNAME_MACHINE=i486 ;;
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586 *Pentium) UNAME_MACHINE=i586 ;;
(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 esac
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
exit 0 ;; exit 0 ;;
i?86:*:3.2:*) i*86:*:3.2:*)
if test -f /usr/options/cb.name; then if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
......
config.sub
View file @ e39aaf80
This diff is collapsed.
configure.in
View file @ e39aaf80
...@@ -264,7 +264,16 @@ case "$target_os" in ...@@ -264,7 +264,16 @@ case "$target_os" in
;; ;;
esac esac
;; ;;
sysv5uw7*) sysv5UnixWare*)
if test "$GCC" != "yes"; then
# We are using built-in inline function
CFLAGS="$CFLAGS -Kalloca"
CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
else
CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
fi
;;
sysv5OpenUNIX8*)
if test "$GCC" != "yes"; then if test "$GCC" != "yes"; then
# We are using built-in inline function # We are using built-in inline function
CFLAGS="$CFLAGS -Kalloca" CFLAGS="$CFLAGS -Kalloca"
...@@ -274,7 +283,6 @@ case "$target_os" in ...@@ -274,7 +283,6 @@ case "$target_os" in
fi fi
;; ;;
esac esac
AC_SUBST(CC) AC_SUBST(CC)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(CXX) AC_SUBST(CXX)
...@@ -990,7 +998,7 @@ fi ...@@ -990,7 +998,7 @@ fi
if test "$with_named_thread" = "no" if test "$with_named_thread" = "no"
then then
AC_MSG_CHECKING("SCO UnixWare7 native threads") AC_MSG_CHECKING("SCO UnixWare7 native threads")
if expr "$SYSTEM_TYPE" : ".*unixware7*" > /dev/null if expr "$SYSTEM_TYPE" : ".*UnixWare*" > /dev/null
then then
if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so
then then
...@@ -1020,6 +1028,45 @@ then ...@@ -1020,6 +1028,45 @@ then
fi fi
fi fi
# Hack for Caldera OpenUNIX8
#
if test "$with_named_thread" = "no"
then
AC_MSG_CHECKING("OpenUNIX8 native threads")
if expr "$SYSTEM_TYPE" : ".*OpenUNIX*" > /dev/null
then
if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so
then
MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
with_named_thread="-Kthread -lsocket -lnsl"
if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
then
# AC_DEFINE(HAVE_OpenUNIX8_THREADS)
AC_DEFINE(HAVE_UNIXWARE7_THREADS)
else
# AC_DEFINE(HAVE_OpenUNIX8_POSIX)
AC_DEFINE(HAVE_UNIXWARE7_POSIX)
fi
# We must have cc
AC_MSG_CHECKING("for gcc")
if expr "$CC" : ".*gcc.*"
then
{ echo "configure: error: On OpenUNIX8 and UnixWare7 MySQL must be compiled with cc. See the Installation chapter in the Reference Manual." 1>&2; exit 1; };
else
# CC="$CC -Kthread -DOpenUNIX8";
# CXX="$CXX -Kthread -DOpenUNIX8";
CC="$CC -Kthread -DUNIXWARE_7";
CXX="$CXX -Kthread -DUNIXWARE_7";
fi
AC_MSG_RESULT("yes")
else
{ echo "configure: error: Can't find thread libs on Caldera OpenUNIX 8. See the Installation chapter in the Reference Manual." 1>&2; exit 1; };
fi
else
AC_MSG_RESULT("no")
fi
fi
# Hack for Siemens UNIX # Hack for Siemens UNIX
if test "$with_named_thread" = "no" -a "$with_mit_threads" = "no" if test "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
then then
......
ltconfig
View file @ e39aaf80
...@@ -742,6 +742,12 @@ else ...@@ -742,6 +742,12 @@ else
wl='-Qoption ld ' wl='-Qoption ld '
;; ;;
sysv5UnixWare* | sysv5OpenUNIX*)
pic_flag='-KPIC'
link_static_flag='-Bstatic'
wl='-Wl,'
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
pic_flag='-KPIC' pic_flag='-KPIC'
link_static_flag='-Bstatic' link_static_flag='-Bstatic'
...@@ -1496,6 +1502,18 @@ else ...@@ -1496,6 +1502,18 @@ else
export_dynamic_flag_spec='-Bexport' export_dynamic_flag_spec='-Bexport'
;; ;;
sysv5UnixWare* | sysv5OpenUNIX*)
no_undefined_flag=' -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
archive_cmds='$UW7_compile_command -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
archive_expsym_cmds='$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 $linkopts~$rm $lib.exp'
hardcode_libdir_flag_spec=
hardcode_shlibpath_var=no
runpath_var='LD_RUN_PATH'
;;
sysv5*) sysv5*)
no_undefined_flag=' -z text' no_undefined_flag=' -z text'
# $CC -shared without GNU ld will not create a library from C++ # $CC -shared without GNU ld will not create a library from C++
...@@ -2097,6 +2115,13 @@ sunos4*) ...@@ -2097,6 +2115,13 @@ sunos4*)
need_version=yes need_version=yes
;; ;;
sysv5UnixWare* | sysv5OpenUNIX*)
version_type=linux
soname_spec='${libname}${release}.so$major'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
version_type=linux version_type=linux
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7