[Libreoffice-commits] .: 3 commits - curl/curl-7.19.7.patch curl/makefile.mk libxml2/libxml2-configure.patch libxml2/makefile.mk libxml2/prj libxslt/libxslt-configure.patch libxslt/makefile.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Jun 9 09:32:04 PDT 2011
curl/curl-7.19.7.patch | 22 ++++++++++++++++++++++
curl/makefile.mk | 2 +-
libxml2/libxml2-configure.patch | 25 +++++++++++++++++++++++++
libxml2/makefile.mk | 2 +-
libxml2/prj/d.lst | 3 ++-
libxslt/libxslt-configure.patch | 11 +++++++++++
libxslt/makefile.mk | 2 +-
7 files changed, 63 insertions(+), 4 deletions(-)
New commits:
commit 1c3fac55a78df12dd79e363ca1165d1a4007f31c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jun 9 19:29:05 2011 +0300
Cross-compilation support for Android
diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch
index 0e39cb7..ca25c23 100644
--- a/curl/curl-7.19.7.patch
+++ b/curl/curl-7.19.7.patch
@@ -1,3 +1,14 @@
+--- misc/curl-7.19.7/config.sub
++++ misc/build/curl-7.19.7/config.sub
+@@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/curl-7.19.7/configure 2009-11-04 13:26:02.000000000 +0100
+++ misc/build/curl-7.19.7/configure 2009-11-18 14:17:25.453125000 +0100
@@ -2735,8 +2735,8 @@
@@ -42,6 +53,17 @@
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+--- misc/curl-7.19.7/include/curl/curl.h
++++ misc/build/curl-7.19.7/include/curl/curl.h
+@@ -74,7 +74,7 @@
+ require it! */
+ #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
+ defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
+- defined(ANDROID)
++ defined(__ANDROID__)
+ #include <sys/select.h>
+ #endif
+
--- misc/curl-7.19.7/lib/setup.h 2009-10-28 21:21:58.000000000 +0100
+++ misc/build/curl-7.19.7/lib/setup.h 2009-11-18 13:30:42.375000000 +0100
@@ -193,6 +193,7 @@
diff --git a/curl/makefile.mk b/curl/makefile.mk
index dc9d74d..dfc5720 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -94,7 +94,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-.IF "$(OS)"=="IOS"
+.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
.ELSE
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4
commit bf24af351ea2fb44119c1d038ac40f2e368db046
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jun 9 18:38:45 2011 +0300
Cross-compilation support for Android
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index bfa0b51..3ec9de5 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,3 +1,14 @@
+--- misc/libxslt-1.1.26/config.sub
++++ misc/build/libxslt-1.1.26/config.sub
+@@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- misc/libxslt-1.1.26/ltmain.sh Wed Aug 29 14:28:46 2007
+++ misc/build/libxslt-1.1.26/ltmain.sh Wed Jun 25 13:06:05 2008
@@ -6195,9 +6195,9 @@
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 7167adf..dff4068 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -138,7 +138,7 @@ OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib
OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib
OUT2BIN+=xsltproc$/.libs$/xsltproc
OUT2BIN+=xslt-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
OUT2LIB+=libxslt$/.libs$/libxslt.a
OUT2LIB+=libexslt$/.libs$/libexslt.a
OUT2BIN+=xslt-config
commit 3ed1101c2eddcb96436b713bac7c806bade05550
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jun 9 18:31:01 2011 +0300
Cross-compilation support for Android
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
index 4158c38..8694b6a 100644
--- a/libxml2/libxml2-configure.patch
+++ b/libxml2/libxml2-configure.patch
@@ -1,3 +1,28 @@
+--- misc/libxml2-2.7.6/config.sub
++++ misc/build/libxml2-2.7.6/config.sub
+@@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+--- misc/libxml2-2.7.6/Makefile.in
++++ misc/build/libxml2-2.7.6/Makefile.in
+@@ -41,9 +41,9 @@
+ testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \
+ testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \
+ testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \
+- testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \
++ testapi$(EXEEXT) testModule$(EXEEXT) \
+ runsuite$(EXEEXT) testchar$(EXEEXT) testdict$(EXEEXT) \
+- runxmlconf$(EXEEXT) testrecurse$(EXEEXT)
++ runxmlconf$(EXEEXT)
+ bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT)
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
--- misc/libxml2-2.7.6/ltmain.sh 2009-10-06 17:39:54.000000000 +0100
+++ misc/build/libxml2-2.7.6/ltmain.sh 2009-12-17 11:43:56.000000000 +0000
@@ -6271,8 +6271,8 @@
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 5091360..0eb0801 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -123,7 +123,7 @@ EXTRPATH=URELIB
OUT2LIB+=.libs$/libxml2.*.dylib
OUT2BIN+=.libs$/xmllint
OUT2BIN+=xml2-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
OUT2LIB+=.libs$/libxml2.a
OUT2BIN+=xml2-config
.ELIF "$(OS)"=="WNT"
diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst
index 9b5d736..e28c52e 100644
--- a/libxml2/prj/d.lst
+++ b/libxml2/prj/d.lst
@@ -3,7 +3,8 @@ mkdir: %_DEST%\inc\external\libxml
..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2
symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so
..\%__SRC%\lib\*.lib %_DEST%\lib
-..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.a
+..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a
+..\%__SRC%\lib\libxml2.a %_DEST%\lib\libxml2.a
..\%__SRC%\bin\*.dll %_DEST%\bin
..\%__SRC%\bin\xmllint* %_DEST%\bin
..\%__SRC%\bin\xml2-config* %_DEST%\bin
More information about the Libreoffice-commits
mailing list