[Libreoffice-commits] .: openssl/makefile.mk

Michael Meeks michael at kemper.freedesktop.org
Sat Jan 21 13:41:35 PST 2012


 openssl/makefile.mk |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 926822b241e6c8037fbda650667637d83b2b7cc0
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Sat Jan 21 21:40:29 2012 +0000

    android: don't add -I/usr/include to the compile line - urk

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index f537838..dcbf04e 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -53,7 +53,12 @@ TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4
 
 CONFIGURE_DIR=.
 CONFIGURE_ACTION=config
+.IF "$(OS)" == "ANDROID"
+CONFIGURE_FLAGS=shared no-idea
+.ELSE
+# explicitly including /usr/include seems hyper-broken anyway but ...
 CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared no-idea
+.ENDIF
 
 BUILD_DIR=.
 


More information about the Libreoffice-commits mailing list