The attached patches remove OSF/1 support from the build system and some
application code.
There are still OSF1 references in the following files:
libs-extern/libtextcat/libtextcat-2.2.patch
libs-extern/libxmlsec/xmlsec1-update-config-sub-and-guess.patch
libs-extern-sys/python/Python-2.6.1-mingw.patch
but since they are patches, I didn't dare modify them.
I have also let dmake/ untouched.
--
Francois Tigeot
diff --git a/configure.in b/configure.in
index 45a22cd..ddf1614 100755
--- a/configure.in
+++ b/configure.in
@@ -1470,12 +1470,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
@@ -2050,27 +2044,6 @@ 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 ===================================================================
if test -z "$with_perl_home"; then
@@ -2645,22 +2618,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...
@@ -3679,9 +3636,6 @@ if test "$enable_epm" = "yes"; then
*BSD)
PKGFORMAT=bsd
;;
- OSF1)
- PKGFORMAT=setld
- ;;
WINNT)
PKGFORMAT=msi
;;
diff --git a/post_download.in b/post_download.in
index 12b03d9..3c542b8 100755
--- a/post_download.in
+++ b/post_download.in
@@ -33,9 +33,6 @@ case "$build_os" in
freebsd*)
_os=FreeBSD
;;
- osf)
- _os=OSF1
- ;;
*netbsd*)
_os=NetBSD
;;
diff --git a/set_soenv.in b/set_soenv.in
index 2d810b3..1b07221 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -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")
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 40ebe83..e3823f9 100755
--- a/solenv/bin/modules/osarch.pm
+++ b/solenv/bin/modules/osarch.pm
@@ -24,7 +24,6 @@ chop( $m_str, $s_str );
"NetBSD", "netbsd",
"OpenBSD", "openbsd",
"DragonFly", "dragonfly"
- "OSF1", "decunix",
"SCO_SV", "scoosr5",
# "SCO_SV", "scouw21",
"Darwin", "macosxp",
@@ -40,7 +39,6 @@ chop( $m_str, $s_str );
"NetBSD", "-DNETBSD",
"OpenBSD", "-DOPENBSD",
"DragonFly", "-DDRAGONFLY",
- "OSF1", "-DSYSV -DDECUNIX",
"SCO_SV", "-DSYSV -DSCO -DSCO_OSR5",
# "SCO_SV", "-DSYSV -DSCO -DSCO_UW21",
"Darwin", "-DBSD -DMACOSX",
diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/mozsrc/jri_md.h
index 0bc2e90..f02dcf0 100644
--- a/np_sdk/mozsrc/jri_md.h
+++ b/np_sdk/mozsrc/jri_md.h
@@ -208,16 +208,7 @@ typedef juint jsize;
#ifdef HAVE_LONG_LONG
-#ifdef OSF1
-
-/* long is default 64-bit on OSF1, -std1 does not allow long long */
-typedef long jlong;
-typedef unsigned long julong;
-#define jlong_MAXINT 0x7fffffffffffffffL
-#define jlong_MININT 0x8000000000000000L
-#define jlong_ZERO 0x0L
-
-#elif (defined(WIN32) || defined(_WIN32))
+#if (defined(WIN32) || defined(_WIN32))
typedef LONGLONG jlong;
typedef DWORDLONG julong;
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index 9ae77c8..72dfa6f 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -46,7 +46,7 @@ extern "C" int mntctl( int cmd, size_t size, char* buf );
#elif defined(NETBSD)
#include <sys/mount.h>
#elif defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \
- defined(DECUNIX) || defined(DRAGONFLY)
+ defined(DRAGONFLY)
struct mnttab
{
char *mnt_dir;
@@ -149,7 +149,7 @@ static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab)
return FALSE;
struct mnttab mnt[1];
while (fread (&mnt, sizeof mnt, 1, fp) > 0)
-#elif defined DECUNIX || defined AIX
+#elif defined AIX
FILE *fp = NULL;
if (! fp)
return FALSE;
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
