diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-09 18:31:01 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-09 18:36:15 +0300 |
| commit | 971fbd84812400341e9858959cd812f85fd49e4c (patch) | |
| tree | 3d9afc5c875479a0e7ea40de93ad8449e6b95254 /libxml2 | |
| parent | ce7f9f70401a7d4b02a0c218633370ff0c01dd0c (diff) | |
Cross-compilation support for Android
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/libxml2-configure.patch | 25 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 2 | ||||
| -rw-r--r-- | libxml2/prj/d.lst | 3 |
3 files changed, 28 insertions, 2 deletions
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch index 4158c38ef47f..8694b6a4d328 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 5091360b94f3..0eb08019f1b6 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 9b5d736dbe99..e28c52e22415 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 |