More cross-compiling work

3 files changed, 65 insertions, 20 deletions

diff --git a/conf-for-build.in b/conf-for-build.in
deleted file mode 100755
index 196b2f12b..000000000
--- a/conf-for-build.in
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_INIT([LibreOffice], [3.3],,, [http://documentfoundation.org/])
-AC_PREREQ(2.50)
-AC_CANONICAL_SYSTEM
-AC_PROG_CC
-AC_PROG_CXX
-
-
-echo CC_FOR_BUILD='${CC_FOR_BUILD:-'$CC'}' >&3
-echo CXX_FOR_BUILD='${CXX_FOR_BUILD:-'$CXX'}' >&3
diff --git a/configure.in b/configure.in
index f7a485320..1306f6bc2 100755
--- a/configure.in
+++ b/configure.in
@@ -1654,19 +1654,60 @@ dnl machine when doing cross-compilation
 dnl ===================================================================
 
 if test "$cross_compiling" = "yes"; then
-  export tmpdir=`mktemp -d conf.XXXXXX`
-  eval `(unset CC CXX CFLAGS
-    autoconf conf-for-build.in >$tmpdir/conf-for-build
+  AC_MSG_CHECKING([for BUILD platform configuration])
+  echo
+  export tmpdir=`mktemp -d conf-for-build.XXXXXX`
+  tar cf - \
+	configure \
+	config.guess \
+	solenv/inc/minor.mk \
+	solenv/inc/postset.mk \
+	set_soenv.in \
+	bootstrap.1 \
+	post_download.in \
+	ooo.lst.in \
+	Makefile.in \
+	makefile.rc \
+	bin/repo-list.in | (cd $tmpdir && tar xf -)
+  (
+    unset COM GUI GUIBASE OS CPU CPUNAME CC CXX CFLAGS
+    test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD"
+    test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD"
     cd $tmpdir
-    sh ./conf-for-build 3>&1 >/dev/null)`
+    sub_conf_opts=""
+    test -n $with_external_tar && sub_conf_opts="$sub_conf_opts --with-external-tar='$with_external_tar'"
+    ./configure \
+	--disable-mozilla \
+	--disable-build-mozilla \
+	2>&1 | sed -e 's/^/    /'
+    . ./*Env.Set.sh
+    for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET; do
+      VV='$'$V
+      VV=`eval "echo $VV"`
+      if test -n "$VV"; then
+	line=${V}_FOR_BUILD='${'${V}_FOR_BUILD:-$VV'}'
+        echo "$line" >>build-config
+      fi
+    done
+  )
+  eval `cat $tmpdir/build-config`
+  AC_MSG_RESULT([checking for BUILD platform configuration... done])
   rm -rf $tmpdir
   unset tmpdir
 else
   CC_FOR_BUILD="$CC"
   CXX_FOR_BUILD="$CXX"
 fi
+AC_SUBST(COM_FOR_BUILD)
+AC_SUBST(GUI_FOR_BUILD)
+AC_SUBST(GUIBASE_FOR_BUILD)
+AC_SUBST(OS_FOR_BUILD)
+AC_SUBST(CPU_FOR_BUILD)
+AC_SUBST(CPUNAME_FOR_BUILD)
 AC_SUBST(CC_FOR_BUILD)
 AC_SUBST(CXX_FOR_BUILD)
+AC_SUBST(GXX_INCLUDE_PATH_FOR_BUILD)
+AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
 
 dnl ===================================================================
 dnl Checks for --with-local-solenv invocation
diff --git a/set_soenv.in b/set_soenv.in
index d001f5dde..4c0910a08 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1016,9 +1016,11 @@ $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
 $L10N_MODULE = PathFormat($SRC_ROOT."/translations");
 
 # Check for poor help localizations, i.e. no help translation at all...
-opendir(DIR,$L10N_MODULE . "/source");
-@languages = readdir(DIR);
-closedir(DIR);
+@languages=();
+if (opendir(DIR,$L10N_MODULE . "/source"))
+{  @languages = readdir(DIR);
+   closedir(DIR);
+}
 $WITH_POOR_HELP_LOCALIZATIONS = "";
 
 foreach $language (@languages)
@@ -1756,10 +1758,21 @@ ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
 ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
 ToFile( "CC",                $CC,                "e" );
 ToFile( "CROSS_COMPILING",   "@CROSS_COMPILING@","e" );
-ToFile( "BUILD_PLATFORM",    "@build@",          "e" );
-ToFile( "HOST_PLATFORM",     "@host@",           "e" );
-ToFile( "CC_FOR_BUILD",      "@CC_FOR_BUILD@",   "e" );
-ToFile( "CXX_FOR_BUILD",     "@CXX_FOR_BUILD@",  "e" );
+if ( '@CROSS_COMPILING@' ne '' )
+{
+   ToFile( "BUILD_PLATFORM",    "@build@",          "e" );
+   ToFile( "HOST_PLATFORM",     "@host@",           "e" );
+   ToFile( "COM_FOR_BUILD",     "@COM_FOR_BUILD@",  "e" );
+   ToFile( "GUI_FOR_BUILD",     "@GUI_FOR_BUILD@",  "e" );
+   ToFile( "GUIBASE_FOR_BUILD", "@GUIBASE_FOR_BUILD@", "e" );
+   ToFile( "OS_FOR_BUILD",      "@OS_FOR_BUILD@",   "e" );
+   ToFile( "CPU_FOR_BUILD",     "@CPU_FOR_BUILD@",  "e" );
+   ToFile( "CPUNAME_FOR_BUILD", "@CPUNAME_FOR_BUILD@", "e" );
+   ToFile( "CC_FOR_BUILD",      "@CC_FOR_BUILD@",   "e" );
+   ToFile( "CXX_FOR_BUILD",     "@CXX_FOR_BUILD@",  "e" );
+   ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" );
+   ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" );
+}
 ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
 		"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
 ToFile( "HAVE_GCC_VISIBILITY_BROKEN",