mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove OSF/1 support.

Browse Source
This commit is contained in:
Francois Tigeot
2011-02-20 21:46:56 +01:00
parent ab50df50a8
commit 60fe1a1958
3 changed files with 5 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
configure.in
View File

@@ -1485,12 +1485,6 @@ case "$host_os" in
AC_MSG_RESULT([$PTHREAD_LIBS])
_os=FreeBSD
;;
osf)
test_cups=no
test_cairo=no
test_randr=no
_os=OSF1
;;
*netbsd*)
test_gtk=yes
build_gstreamer=yes
@@ -2064,27 +2058,6 @@ if test "$GCC" = "yes"; then
fi
AC_SUBST(HAVE_LD_HASH_STYLE)
dnl ===================================================================
dnl Test the Compaq compiler for OSF1
dnl ===================================================================
if test "$_os" = "OSF1"; then
if test "$CC" = "cc"; then
AC_PATH_PROGS(_cc, cc)
COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
AC_MSG_WARN([******* $_cc , $COMPATH])
AC_MSG_CHECKING([the Compaq C compiler version])
dnl cc -V outputs to standard error!!!!
_compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'`
_compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
if test "$_compaqc_major" != "T6"; then
AC_MSG_ERROR([found version "$_compaqc_version", use version 6 of the Compaq C compiler])
else
dnl compiler will do
AC_MSG_RESULT([checked])
fi
fi
fi
dnl ===================================================================
dnl Check whether there's a Perl version available.
dnl ===================================================================
@@ -2660,22 +2633,6 @@ if test "$_os" = "SunOS"; then
fi
fi
fi
dnl ===================================================================
dnl Extra checking for the OSF compiler
dnl ===================================================================
if test "$_os" = "OSF1"; then
AC_MSG_CHECKING([Compaq C++ compiler version])
dnl cxx -V outputs to standard error!!!!
_compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'`
_compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'`
if test "$_compaqcxx_major" != "V6"; then
AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C++ compiler])
echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn
else
dnl compiler will do
AC_MSG_RESULT([checked])
fi
fi
dnl *************************************************************
dnl Testing for exception handling - dwarf2 or sjlj exceptions...
@@ -3694,9 +3651,6 @@ if test "$enable_epm" = "yes"; then
*BSD)
PKGFORMAT=bsd
;;
OSF1)
PKGFORMAT=setld
;;
WINNT)
PKGFORMAT=msi
;;

3
post_download.in
View File

@@ -33,9 +33,6 @@ case "$build_os" in
freebsd*)
_os=FreeBSD
;;
osf)
_os=OSF1
;;
*netbsd*)
_os=NetBSD
;;

34
set_soenv.in
View File

@@ -648,26 +648,6 @@ elsif ( $platform =~ m/linux/ )
$INPATH = $OUTPATH.$PROEXT;
}
elsif ( $platform =~ m/osf1/ )
{ print "Setting Tru64 specific values... ";
$outfile = "Tru64AlphaEnv.Set.sh";
$BIG_SVX = "TRUE";
$COM = "CXX";
$COMPATH = '@COMPATH@';
$CPU = "A";
$CPUNAME = "ALPHA_";
$CVER = "C62";
$GUI = "UNX";
$GUIBASE = "unx";
$GVER = "VCL";
$OUTPATH = "unxt64";
$INPATH = $OUTPATH.$PROEXT;
$OS = "TRU64";
$PATH_SEPERATOR = $ps;
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
}
elsif ( $platform =~ m/cygwin/ )
{
$MSPDB_PATH = PathFormat('@MSPDB_PATH@');
@@ -1089,7 +1069,7 @@ if ($platform =~ m/solaris/)
$L.$USR_DT.$LIB.
$L.$USR_OPENWIN.$LIB;
}
elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix|openbsd|dragonfly/)
elsif ($platform =~ m/linux|netbsd|freebsd|aix|openbsd|dragonfly/)
{
$SOLAREXTRALIB = $L.$par_dir.$LIB64;
}
@@ -1152,7 +1132,7 @@ if ($platform =~ m/cygwin|os2/)
}
# The general environment path.
if ($platform =~ m/linux|netbsd|osf1|freebsd|aix|solaris|openbsd|dragonfly/)
if ($platform =~ m/linux|netbsd|freebsd|aix|solaris|openbsd|dragonfly/)
{ $PATH = $cur_dir.
# $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1375,7 +1355,7 @@ if ($platform =~ m/solaris/)
$L.$JRETHREADDIR.
$L.$XLIB;
}
elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd|openbsd|dragonfly/)
elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/)
{ $SOLARLIB = $L.$par_dir.$LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
$L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
@@ -1421,7 +1401,7 @@ $SOLARINC = $I.$cur_dir.
$I.'$SOLARENV'.$INC.
$I.'$SRC_ROOT'.$ds."res";
if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd|aix|openbsd|dragonfly/)
if ($platform =~ m/solaris|linux|freebsd|netbsd|aix|openbsd|dragonfly/)
{
if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
{
@@ -1449,7 +1429,7 @@ if ($platform =~ m/solaris/)
if ($platform =~ m/solaris/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
}
elsif ($platform =~ m/linux|osf1/)
elsif ($platform =~ m/linux/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
}
elsif ($platform =~ m/freebsd/)
@@ -1476,10 +1456,6 @@ if ($platform =~ m/solaris/)
if ($platform =~ m/linux|freebsd|netbsd|aix|openbsd|dragonfly/)
{ $SOLARINC .= $I.$XINC;
}
elsif ($platform =~ m/osf1/)
{ $SOLARINC .= $I.$XINC.
$I.$USR.$INCLUDE;
}
}
elsif ($platform =~ m/cygwin/)
{ if ($JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")