[Libreoffice-commits] .: 4 commits - libxmlsec/makefile.mk libxmlsec/xmlsec1-android.patch

[Tor Lillqvist]

 libxmlsec/makefile.mk           |   18 ++++++++++++++++--
 libxmlsec/xmlsec1-android.patch |   20 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit 58ba34844a9b1b70e1192abd303544b452f3ad33
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Nov 3 17:22:45 2011 +0200

    Add the xmlsec1 Android patch

diff --git a/libxmlsec/xmlsec1-android.patch b/libxmlsec/xmlsec1-android.patch
new file mode 100644
index 0000000..4a7d4e0
--- /dev/null
+++ b/libxmlsec/xmlsec1-android.patch
@@ -0,0 +1,20 @@
+--- misc/build/xmlsec1-1.2.14/config.sub
++++ misc/build/xmlsec1-1.2.14/config.sub
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+@@ -1275,7 +1275,7 @@
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
commit 6744ccd78233a8d053fd2353a146eeba803a5b21
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Nov 3 17:21:20 2011 +0200

    Don't bother with --with-openssl=no for Android then as we do use openssl

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index d51d7ae..caefaad 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -151,7 +151,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
-CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
+CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
 
 .IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
@@ -159,6 +159,8 @@ CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 
 .IF "$(OS)" == "ANDROID"
 CONFIGURE_FLAGS+=--with-openssl=$(SOLARVER)/$(INPATH)
+.ELSE
+CONFIGURE_FLAGS+=--with-openssl=no
 .ENDIF
 
 # system-mozilla needs pkgconfig to get the information about nss
commit 64a25bc57a7897b8feb1ab974a9c344b23dbc26d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Nov 3 16:54:16 2011 +0200

    Pass --build and --host to xmlsec1 configury when cross-compiling

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 0c83fbb..d51d7ae 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -153,6 +153,10 @@ CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
 CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
 
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 .IF "$(OS)" == "ANDROID"
 CONFIGURE_FLAGS+=--with-openssl=$(SOLARVER)/$(INPATH)
 .ENDIF
commit c163a614997f3967581ead98b5135787b473235a
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Nov 3 16:52:46 2011 +0200

    Use our openssl build as crypto lib for xmlsec1 for Android
    
    Seems to build that way; no idea if it works of course.

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 5388580..0c83fbb 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -68,7 +68,8 @@ PATCH_FILES=\
    xmlsec1-mingw32.patch \
    xmlsec1-mingw-keymgr-mscrypto.patch \
    xmlsec1-vc10.patch \
-   xmlsec1-1.2.14_fix_extern_c.patch
+   xmlsec1-1.2.14_fix_extern_c.patch \
+   xmlsec1-android.patch
 
 ADDITIONAL_FILES= \
     include$/xmlsec$/mscrypto$/akmngr.h \
@@ -151,6 +152,11 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
 CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
+
+.IF "$(OS)" == "ANDROID"
+CONFIGURE_FLAGS+=--with-openssl=$(SOLARVER)/$(INPATH)
+.ENDIF
+
 # system-mozilla needs pkgconfig to get the information about nss
 # FIXME: This also will enable pkg-config usage for libxml2. It *seems*
 # that the internal headers still are used when they are there but....
@@ -178,6 +184,8 @@ OUT2BIN+=src$/.libs$/libxmlsec1.dll src$/nss$/.libs$/libxmlsec1-nss.dll src$/msc
 OUT2LIB+=win32$/binaries$/*.lib
 OUT2BIN+=win32$/binaries$/*.dll
 .ENDIF
+.ELIF "$(OS)" == "ANDROID"
+OUT2LIB+=src$/.libs$/libxmlsec1.a src$/openssl/.libs$/libxmlsec1-openssl.a
 .ELSE
 OUT2LIB+=src$/.libs$/libxmlsec1.a src$/nss$/.libs$/libxmlsec1-nss.a
 .ENDIF