summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2011-04-01 10:23:05 +0200
committerIvo Hinkelmann <ihi@openoffice.org>2011-04-01 10:23:05 +0200
commit50628e59cb8c26d419653488e861c6079829a084 (patch)
tree77e34a7038fa054c1f67954e13300a7e6c752b8b
parent4b2ca8301e621bfd49b0fbb448fefc05d9b1e9e6 (diff)
parent5e9ffbb85ee548a2f31ed99834c13d6c4ec4d714 (diff)
CWS-TOOLING: integrate CWS solaris11
-rwxr-xr-xconfigure31
-rw-r--r--configure.in31
-rw-r--r--set_soenv.in4
-rwxr-xr-xsolenv/bin/checkdll.sh2
-rw-r--r--solenv/gbuild/platform/solaris.mk9
5 files changed, 57 insertions, 20 deletions
diff --git a/configure b/configure
index ed880fb2699d..2c64bd652da3 100755
--- a/configure
+++ b/configure
@@ -11645,16 +11645,18 @@ echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;
if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
# check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
-
- if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then
+ javac_link_f=`readlink -f "$JAVACOMPILER" 2>/dev/null`
+ if test $? == 0 && test "$JAVACOMPILER" != "$javac_link_f"; then
# try to recover first by looking whether we have a alternatives
# system as in Debian or newer SuSEs where following /usr/bin/javac
# over /etc/alternatives/javac leads to the right bindir where we
# just need to strip a bit away to get a valid JAVA_HOME
- JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
+ # Solaris 11 is even worse, because target is relative, so use -f
+ JAVA_HOME="$javac_link_f"
elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
- # maybe only one level of symlink (e.g. on Mac)
- JAVA_HOME=$(readlink $JAVACOMPILER)
+ # Darwin readlink(1) is so primitive it doesn't even support -f
+ # maybe only one level of symlink (e.g. on Mac)
+ JAVA_HOME=`readlink $JAVACOMPILER`
else
# else warn
{ echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5
@@ -26065,7 +26067,11 @@ fi
if test -z "$with_gnu_cp"; then
- for ac_prog in gnucp cp
+ # check the place where the good stuff is hidden on Solaris...
+ if test -x /usr/gnu/bin/cp; then
+ GNUCP=/usr/gnu/bin/cp
+ else
+ for ac_prog in gnucp cp
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -26109,6 +26115,7 @@ fi
test -n "$GNUCP" && break
done
+ fi
if test -z $GNUCP; then
{ { echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5
echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;}
@@ -30815,9 +30822,13 @@ echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6
if test -f $ANT_HOME/lib/ant/ant.jar; then
ANT_LIB="$ANT_HOME/lib/ant"
else
- { { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
+ if test -f /usr/share/lib/ant/ant.jar; then
+ ANT_LIB=/usr/share/lib/ant
+ else
+ { { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
echo "$as_me: error: Ant libraries not found!" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
fi
fi
@@ -30919,7 +30930,11 @@ echo $ECHO_N "checking for JUnit 4... $ECHO_C" >&6
if test -e /usr/share/java/junit4.jar; then
OOO_JUNIT_JAR=/usr/share/java/junit4.jar
else
- OOO_JUNIT_JAR=/usr/share/java/junit.jar
+ if test -e /usr/share/lib/java/junit.jar; then
+ OOO_JUNIT_JAR=/usr/share/lib/java/junit.jar
+ else
+ OOO_JUNIT_JAR=/usr/share/java/junit.jar
+ fi
fi
else
OOO_JUNIT_JAR=$with_junit
diff --git a/configure.in b/configure.in
index 1991e152590f..10dcbb3cba17 100644
--- a/configure.in
+++ b/configure.in
@@ -3042,16 +3042,18 @@ _ACEOF
if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
# check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
-
- if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then
+ javac_link_f=`readlink -f "$JAVACOMPILER" 2>/dev/null`
+ if test $? == 0 && test "$JAVACOMPILER" != "$javac_link_f"; then
# try to recover first by looking whether we have a alternatives
# system as in Debian or newer SuSEs where following /usr/bin/javac
# over /etc/alternatives/javac leads to the right bindir where we
# just need to strip a bit away to get a valid JAVA_HOME
- JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
+ # Solaris 11 is even worse, because target is relative, so use -f
+ JAVA_HOME="$javac_link_f"
elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
- # maybe only one level of symlink (e.g. on Mac)
- JAVA_HOME=$(readlink $JAVACOMPILER)
+ # Darwin readlink(1) is so primitive it doesn't even support -f
+ # maybe only one level of symlink (e.g. on Mac)
+ JAVA_HOME=`readlink $JAVACOMPILER`
else
# else warn
AC_MSG_WARN([JAVA_HOME is set to /usr - this is very likely to be incorrect])
@@ -5475,7 +5477,12 @@ fi
dnl We also need to check for --with-gnu-cp
if test -z "$with_gnu_cp"; then
- AC_PATH_PROGS(GNUCP, gnucp cp)
+ # check the place where the good stuff is hidden on Solaris...
+ if test -x /usr/gnu/bin/cp; then
+ GNUCP=/usr/gnu/bin/cp
+ else
+ AC_PATH_PROGS(GNUCP, gnucp cp)
+ fi
if test -z $GNUCP; then
AC_MSG_ERROR([Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it])
fi
@@ -7016,7 +7023,11 @@ if test "$ANT_HOME" != "NO_ANT_HOME"; then
if test -f $ANT_HOME/lib/ant/ant.jar; then
ANT_LIB="$ANT_HOME/lib/ant"
else
- AC_MSG_ERROR([Ant libraries not found!])
+ if test -f /usr/share/lib/ant/ant.jar; then
+ ANT_LIB=/usr/share/lib/ant
+ else
+ AC_MSG_ERROR([Ant libraries not found!])
+ fi
fi
fi
fi
@@ -7103,7 +7114,11 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
if test -e /usr/share/java/junit4.jar; then
OOO_JUNIT_JAR=/usr/share/java/junit4.jar
else
- OOO_JUNIT_JAR=/usr/share/java/junit.jar
+ if test -e /usr/share/lib/java/junit.jar; then
+ OOO_JUNIT_JAR=/usr/share/lib/java/junit.jar
+ else
+ OOO_JUNIT_JAR=/usr/share/java/junit.jar
+ fi
fi
else
OOO_JUNIT_JAR=$with_junit
diff --git a/set_soenv.in b/set_soenv.in
index fc4d46c9ba4d..6a8c65baa246 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -214,7 +214,7 @@ if ( $platform =~ m/solaris/ )
$CPU = "I";
$CPUNAME = "INTEL";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."motif21";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
@@ -230,7 +230,7 @@ if ( $platform =~ m/solaris/ )
$CPU = "S";
$CPUNAME = "SPARC";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."motif21";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
}
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index a9a502c7f6af..efafb6b8ef60 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -42,7 +42,7 @@ if [ -x $checkdll ]; then
-L) shift; option=$1;;
--) break;;
esac
- case "${libpath+X}" in
+ case "${libpath:+X}" in
X) libpath=$libpath:$option;;
*) libpath=$option;;
esac
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index f39f3e559385..30ba1350f532 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -101,6 +101,8 @@ gb_LinkTarget_LDFLAGS := \
-temp=/tmp \
-w \
-mt \
+ -Bdirect \
+ -z defs \
-z combreloc \
-norunpath \
-PIC \
@@ -248,11 +250,16 @@ gb_Library_OOOEXT := ss$(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
endif
+gb_STDLIBS := \
+ Crun \
+ m \
+ c \
+
gb_Library_PLAINLIBS_NONE += \
+ $(gb_STDLIBS) \
dl \
freetype \
jpeg \
- m \
pthread \
X11 \
Xext \