[Libreoffice-commits] .: 3 commits - distro-configs/LibreOfficeiOS.conf solenv/inc

[Tor Lillqvist]

 distro-configs/LibreOfficeiOS.conf |    2 +-
 solenv/inc/settings.mk             |   18 ++++++++++++++++++
 solenv/inc/unxiosr.mk              |    5 -----
 3 files changed, 19 insertions(+), 6 deletions(-)

New commits:
commit aef9612eab04808dc12a92887b8c0b3ed91b5f81
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun May 15 04:30:00 2011 +0300

    Don't need to do this here any more

diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 07877b8..64fd81f 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -27,11 +27,6 @@
 
 # --- Unix Environment for iOS cross-compilation -------------
 
-.IF "$(TARGETPLATFORM)"=="BUILD"
-CC:=$(CC_FOR_BUILD)
-CXX:=$(CXX_FOR_BUILD)
-.ENDIF
-
 CFLAGS=-c $(EXTRA_CFLAGS)
 
 LINKC*=$(CC)
commit 6180a0d5aaf463285d08c9dd31335c76920aa703
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun May 15 04:26:27 2011 +0300

    Propagate FOO_FOR_BUILD variables when compiling for the build system

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index f919292..80c6b72 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -34,6 +34,24 @@ MKFILENAME:=SETTINGS.MK
 force_dmake_to_error
 .ENDIF
 
+# If we are building a target that should run on the build platform,
+# set variables for suitable for that, and not the host ("target")
+# platform.
+.IF "$(CROSS_COMPILING)"!="" && "$(TARGETPLATFORM)"=="BUILD"
+# I wonder if one could use some dmake foreach loop here...
+COM:=$(COM_FOR_BUILD)
+GUI:=$(GUI_FOR_BUILD)
+GUIBASE:=$(GUIBASE_FOR_BUILD)
+OS:=$(OS_FOR_BUILD)
+CPU:=$(CPU_FOR_BUILD)
+CPUNAME:=$(CPUNAME_FOR_BUILD)
+CC:=$(CC_FOR_BUILD)
+CXX:=$(CXX_FOR_BUILD)
+GXX_INCLUDE_PATH:=$(GXX_INCLUDE_PATH_FOR_BUILD)
+MACOSX_DEPLOYMENT_TARGET:=$(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
+.EXPORT: MACOSX_DEPLOYMENT_TARGET
+.ENDIF
+
 .INCLUDE .IGNORE : ooo_vendor.mk
 
 # --- common tool makros --------------------------------------
commit 84bc75d356f178722b38330e3f468b86273178b2
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun May 15 04:24:09 2011 +0300

    Don't claim to be official TDF, don't build stlport

diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 0ce6cd7..02008d5 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -1,4 +1,3 @@
---with-vendor=The Document Foundation
 --build=i386-apple-darwin10.7.0
 --host=arm-apple-darwin10
 --disable-cairo
@@ -20,4 +19,5 @@
 --without-java
 --without-junit
 --without-ppds
+--without-stlport
 --without-system-python