[Libreoffice-commits] core.git: 2 commits - configure.ac odk/docs
Michael Stahl
mstahl at redhat.com
Fri Aug 8 05:19:25 PDT 2014
configure.ac | 53 --------------------------------------------------
odk/docs/install.html | 12 +++++------
2 files changed, 7 insertions(+), 58 deletions(-)
New commits:
commit 4c0eb74307b613aefce4b181817cf137c4517c8a
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 8 13:04:36 2014 +0200
configure: SunStudio is not a (supported) C++ compiler
Change-Id: I65d5f499b2948f9e57c47d262a2d6e5e8cbcf8da
diff --git a/configure.ac b/configure.ac
index 38cb6bd..dc9f86a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2711,32 +2711,6 @@ else
AC_MSG_RESULT([no])
fi
-dnl ===================================================================
-dnl Test the Solaris compiler version
-dnl ===================================================================
-if test "$_os" = "SunOS"; then
- if test "$CC" = "cc"; then
- AC_PATH_PROGS(_cc, cc)
- COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
- AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
- dnl cc -V outputs to standard error!!!!
- _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | $SED -e 's/.* C //'`
- _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
- _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
- if test "$_sunstudio_major" != "5"; then
- AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
- else
- _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
- if test "$_sunstudio_minor" = "false"; then
- AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
- else
- dnl compiler will do
- AC_MSG_RESULT([checked])
- fi
- fi
- fi
-fi
-
dnl ===================================================================
dnl Check OS X SDK and compiler
@@ -5596,16 +5570,7 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
AC_PROG_CXXCPP
dnl Check whether there's a C pre-processor.
- dnl ===================================================================
- dnl When using SunStudio compiler, there is a bug with the cc
- dnl preprocessor, so use CC preprocessor as the cc preprocessor
- dnl See Issuezilla #445.
- dnl ===================================================================
- if test "$_os" = "SunOS"; then
- CPP=$CXXCPP
- else
- AC_PROG_CPP
- fi
+ AC_PROG_CPP
fi
@@ -5906,22 +5871,6 @@ if test "$WITH_MINGW" = "yes"; then
[AC_MSG_RESULT(no)])
fi
-dnl ===================================================================
-dnl Extra checking for the SunOS compiler
-dnl ===================================================================
-if test "$_os" = "SunOS"; then
- dnl SunStudio C++ compiler packaged with SunStudio C compiler
- if test "$CC" = "cc"; then
- AC_MSG_CHECKING([SunStudio C++ Compiler])
- if test "$CXX" != "CC"; then
- AC_MSG_WARN([SunStudio C++ was not found])
- add_warning "SunStudio C++ was not found"
- else
- AC_MSG_RESULT([checked])
- fi
- fi
-fi
-
dnl *************************************************************
dnl Testing for exception handling - dwarf2 or sjlj exceptions...
dnl *************************************************************
commit 3e2ae631ecd84342c7f29f0fd3effd6e635ed89e
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 8 13:01:17 2014 +0200
odk: outdated documentation
Change-Id: I7e675a544729a7e1763d69888d1ad721c70df77c
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 13425da..e29b30a 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -74,7 +74,7 @@
<td><b>JDK (1.5 or higher)</b></td>
<td class="content80">
<p>A JDK is necessary for developing Java components or applications. An appropriate Java SDK can be found on <a target="_blank" href="http://java.sun.com/products" title="link to the Java SDK download page (online)">http://java.sun.com/products</a>.</p>
- <p>Recommendation is to use Java 6 excepting for Mac OS because initially Mac OS supported a 64bit version of Java 6 only.</p>
+ <p>Recommendation is to use Java 7 or later for 64bit, and Java 6 for 32bit.</p>
<p><b>Note</b>: The Java compiler is <b><u>optional</u></b>!</p></td>
</tr>
<tr valign="middle">
@@ -88,16 +88,16 @@
exists:
<table class="table4">
<tr>
- <td class="cell15">Solaris</td>
- <td class="cell85">Sun Studio 8 (20070730)</td>
+ <td class="cell15">Linux</td>
+ <td class="cell80">GNU C++ compiler, gcc version 4.1 or later</td>
</tr>
<tr>
- <td class="cell15">Linux</td>
- <td class="cell80">GNU C++ compiler, gcc version 4.0.1</td>
+ <td class="cell15">Mac OS X</td>
+ <td class="cell80">XCode</td>
</tr>
<tr>
<td class="cell15">Windows</td>
- <td class="cell80">Microsoft C++ Compiler, Microsoft Visual Studio 2008 or the Express version (cl, version 15.00.21022)</td>
+ <td class="cell80">Microsoft C++ Compiler, Microsoft Visual Studio 2010 or later, or the Express edition thereof</td>
</tr>
</table>
<p><b>Note</b>: The C++ compiler is <b><u>optional</u></b>! If you use the Express edition you have to ensure that the <a href="http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en">Microsoft Visual Studio 2008 Redistributable Package</a> is also installed. You can download this package from Microsoft directly.</p></td>
More information about the Libreoffice-commits
mailing list