[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeAndroid.conf postgresql/makefile.mk

[Tor Lillqvist]

 distro-configs/LibreOfficeAndroid.conf |    1 +
 postgresql/makefile.mk                 |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit c7511d9802b95a1a6e708fc61e6d6986f90c39d5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Jan 24 10:46:02 2012 +0200

    Use --build and --host when cross-compiling
    
    Just a start, I suspect the configure script here will fail anyway
    when cross-compiling to Windows at least. And we surely won't even
    bother trying cross-compile this to non-desktop OSes.

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 1e1c4f4..9b5cb35 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -61,6 +61,10 @@ BUILD_DIR=src/interfaces/libpq
 
 CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" LDFLAGS="$(SOLARLIB)" ./configure --without-readline --disable-shared --with-openssl
 
+.IF "$(CROSS_COMPILING)" == "YES"
+CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 .IF "$(WITH_LDAP)" == "YES"
 CONFIGURE_ACTION += --with-ldap
 .IF "$(WITH_OPENLDAP)" != "YES"
commit 32111a7680308a0950d9a956928933b59d6c675d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Jan 24 10:43:09 2012 +0200

    --disable-postgresql-sdbc

diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index fa54534..1c8e763 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -11,6 +11,7 @@
 --disable-mozilla
 --disable-odk
 --disable-opengl
+--disable-postgresql-sdbc
 --disable-python
 --disable-randr
 --disable-randr-link