[Libreoffice-commits] .: Branch 'feature/kill-set_soenv' - 3 commits - configure.in
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Sep 19 12:44:48 PDT 2011
configure.in | 94 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 71 insertions(+), 23 deletions(-)
New commits:
commit ed32cdbd67bfe9ef41cb7301e4474118d82f3d55
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Sep 19 14:44:04 2011 -0500
add preliminary support for darwin for set_soenv killing
diff --git a/configure.in b/configure.in
index 2356ee8..0ff38f4 100755
--- a/configure.in
+++ b/configure.in
@@ -9560,12 +9560,60 @@ case "$host_os" in
fi
CLASSPATH="$JAVA_HOME/jre/lib/rt.jar:."
XCLASSPATH="$CLASSPATH"
- PATH_="$JAVA_HOME/bin$PATH_SEPARATOR.$PATH_SEPARATOR$SRC_ROOT/solenv/$OUTPATH/bin$PATH_SEPARATOR$SRC_ROOT/solenv/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr"
+ PATH_="$JAVA_HOME/bin$PATH_SEPARATOR.$PATH_SEPARATOR$SRC_ROOT/solenv/$OUTPATH/bin$PATH_SEPARATOR$SRC_ROOT/solenv/bin$PATH_SEPARATOR$PATH$"
SOLAREXTRALIB=" -L..$LIB64"
TMPDIR=/tmp
;;
+
+ darwin*)
+ COM=GCC;
+ case "$host_cpu" in
+ arm*)
+ CPU=R
+ CPUNAME=ARM
+ OUTPATH=unxiosr
+ GUI=UNX;
+ OS=IOS;
+ GUIBASE=cocoatouch
+ ;;
+ powerpc*)
+ CPU=P
+ CPUNAME="POWERPC"
+ OUTPATH="unxmacxp"
+ OS="MACOSX"
+ GUI="UNX"
+ FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks"
+ if test "$XLIB" = "no_x_libraries"; then
+ GUIBASE="aqua"
+ else
+ GUIBASE="unx"
+ fi
+ ;;
+ *)
+ CPU=I
+ CPUNAME=INTEL
+ OUTPATH=unxmacxi
+ OS=MACOSX
+ GUI=UNX
+ FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks"
+ if test "$XLIB" = "no_x_libraries"; then
+ GUIBASE="aqua"
+ else
+ GUIBASE="unx"
+ fi
+ ;;
+ esac
+ GVER=VCL
+ INPATH=OUTPATH${PROEXT};
+ PATH_SEPERATOR=:
+ PATH_="$SRC_ROOT/solenv/$OUTPATH/bin:$SRC_ROOT/solenv/bin:$PATH"
+ if test -x "$TMPDIR" ; then
+ TMPDIR=/tmp
+ fi
+ ;;
+
*)
- AC_MSG_ERROR([Unknown host_os $host_cpu])
+ AC_MSG_ERROR([Unknown host_os $host_os])
;;
esac
AC_MSG_RESULT([$INPATH])
commit 575dfb19366d4d41acbaf31d8a600a3121367f5f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Sep 19 14:43:16 2011 -0500
use if test rather than if [[ to avoid confusion
diff --git a/configure.in b/configure.in
index 69a9ae9..2356ee8 100755
--- a/configure.in
+++ b/configure.in
@@ -9385,7 +9385,7 @@ SRC_ROOT=`pwd -P`
popd > /dev/null
SOLARENV="$SRC_ROOT/solenv"
SOLARVER="$SRC_ROOT/solver"
-if [[ "$TARFILE_LOCATION" == "DEFAULT" ]]
+if test "$TARFILE_LOCATION" = "DEFAULT"
then
TARFILE_LOCATION="$SRC_ROOT/src"
fi
@@ -9445,22 +9445,22 @@ case "$host_os" in
CPUNAME=GODSON
JREPLATFORMNAME=mips
OUTPATH=unxlngmips
- if [[ "$SIZEOF_LONG" == "8" ]]
+ if test "$SIZEOF_LONG" = "8"
then
JREPLATFORMNAME=mips64
- if [[ "$WORDS_BIGENDIAN" != "yes" ]]
+ if test "$WORDS_BIGENDIAN" != "yes"
then
EPM_FLAGS="-a mips64el"
- if [[ "$JDK" == "gcj" ]]
+ if test "$JDK" = "gcj"
then
JREPLATFORMNAME=mips64el
fi
- fi
+ fi
else
- if [[ "$WORDS_BIGENDIAN" != "yes" ]]
+ if test "$WORDS_BIGENDIAN" != "yes"
then
EPM_FLAGS="-a mipsel"
- if [[ `echo $JDK|grep sun` && -d $JAVA_HOME/jre/lib/mips32 ]]
+ if test -n `echo $JDK|grep sun` -a -d $JAVA_HOME/jre/lib/mips32
then
JREPLATFORMNAME=mips32
JREVMTYPE=client
@@ -9488,7 +9488,7 @@ case "$host_os" in
CPUNAME=POWERPC64
JREPLATFORMNAME=ppc64
OUTPATH=unxlngppc64
- if [[ -z `echo $JDK|grep -i sun` ]]
+ if test -z "`echo $JDK|grep -i sun`"
then
JREVMTYPE=server
fi
@@ -9527,23 +9527,23 @@ case "$host_os" in
#JRE fixups
case "$host_cpu" in
i*86)
- if [[ -n `echo $JDK|grep -i ^IBM` ]]
+ if tests -n "`echo $JDK|grep -i ^IBM`"
then
JRELIBDIR=$JAVA_HOME/jre/bin
JRETOOLKITDIR=$JAVA_HOME/jre/bin/classic
JRETHREADDIR=$JAVA_HOME/jre/bin
fi
- if [[ -n `echo $JDK|grep -i ^BEA` ]]
+ if test -n "`echo $JDK|grep -i ^BEA`"
then
JRETOOLKITDIR=$JAVA_HOME/jre/lib/$JREPLATFORMNAME/jrocket
fi
;;
powerpc)
- if [[ -n `echo $JDK|grep -i ibm` ]]
+ if test -n "`echo $JDK|grep -i ibm`"
then
JRETOOLKITDIR=$JAVA_HOME/jre/lib/$JREPLATFORMNAME/classic
fi
- if [[ -n `echo $JDK|grep -i sun` ]]
+ if test -n "`echo $JDK|grep -i sun`"
then
JREPLATFORMNAME=server
JRETOOLKITDIR=$JAVA_HOME/jre/lib/$JREPLATFORMNAME/server
@@ -9554,7 +9554,7 @@ case "$host_os" in
JAVALIB=" -L$JAVA_HOME$LIB64 -L$JRELIBDIR -L$JRETOOLKITDIR -L$JRETHREADDIR"
SOLARLIB=" -L../lib -L$SOLARENV/$OUTPATH/lib -L$SOLARVER/$INPATH/lib -L$SOLARENV/$OUTPATH/lib -L$XLIB"
SOLARINC=" -I. -I$SOLARVER/$INPATH/inc/stl -I$SOLARVER/$INPATH/inc/external -I$SOLARVER/$INPATH/inc -I$SOLARENV/$OUTPATH/inc -I$SOLARENV/inc -I$SRC_ROOT/res -I$SOLARENV/inc/Xp31"
- if [[ "$JAVA_HOME" != "NO_JAVA_HOME" ]]
+ if test "$JAVA_HOME" != "NO_JAVA_HOME"
then
SOLARINC+=" -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/native_threads/include"
fi
@@ -9601,11 +9601,11 @@ WORKDIR_FOR_BUILD="$WORKDIR"
gb_REPOS="$SRC_ROOT"
WORK_STAMP="$SOURCEVERSION"
DEFAULT_MOZILLA_TOOLKIT="$MOZILLA_TOOLKIT"
-if [[ "$SYSTEM_LIBXSLT" != "YES" ]]
+if test "$SYSTEM_LIBXSLT" != "YES"
then
XSLTPROC="$SOLARVER/$INPATH/bin/xsltproc"
fi
-if [[ "$SYSTEM_BSH" != "YES" ]]
+if test "$SYSTEM_BSH" != "YES"
then
BSH_JAR="$SOLARVER/$INPATH/bin/bsh.jar"
fi
commit 2cc89eccc7ab4674812602c38169248c78e7cbc3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Sep 19 14:41:55 2011 -0500
clean-up trailing spaces
diff --git a/configure.in b/configure.in
index bd78565..69a9ae9 100755
--- a/configure.in
+++ b/configure.in
@@ -3321,9 +3321,9 @@ _ACEOF
AC_TRY_LINK([
#include <iostream>
using namespace std;
-],
+],
[ try { throw 42; } catch (int e) { cout << "Yep, " << e << endl; } ],
- [
+ [
MINGW_GCCDLL=`$OBJDUMP -p conftest.exe | grep 'DLL Name: libgcc' | $SED -e 's at .*DLL Name: @@'`
if test -n "$MINGW_GCCDLL"; then
MINGW_SHARED_GCCLIB=YES
@@ -3341,9 +3341,9 @@ using namespace std;
AC_TRY_LINK([
#include <iostream>
using namespace std;
-],
+],
[ cout << "Hello there." << endl; ],
- [
+ [
MINGW_GXXDLL=`$OBJDUMP -p conftest.exe | grep 'DLL Name: libstdc++' | $SED -e 's at .*DLL Name: @@'`
if test -n "$MINGW_GXXDLL"; then
mingw_gxxdll_root=${MINGW_GXXDLL%.dll}
@@ -9503,7 +9503,7 @@ case "$host_os" in
CPU=3
CPUNAME=S390
JREPLATFORMNAME=s390
- OUTPATH=unxlngs390
+ OUTPATH=unxlngs390
;;
s390x)
CPU=3
@@ -9580,7 +9580,7 @@ DMAKEROOT="$SRC_ROOT/solenv/inc/startup"
GNUCOPY="$GNUCP"
GUIBASE_FOR_BUILD="$GUIBASE"
GUI_FOR_BUILD="$GUI"
-GXX_INCLUDE_PATH_FOR_BUILD="$GXX_INCLUDE_PATH"
+GXX_INCLUDE_PATH_FOR_BUILD="$GXX_INCLUDE_PATH"
HOST_PLATFORM="$host"
INPATH_FOR_BUILD="$INPATH"
JDKLIB="$JAVALIB"
More information about the Libreoffice-commits
mailing list