From 315641944d405f9c304ff8e2dc4de22ae99f45fd Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 26 May 2011 01:13:27 +0300 Subject: Pass --build and --host when cross-compiling --- expat/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'expat') diff --git a/expat/makefile.mk b/expat/makefile.mk index 867e2b371558..6084cf54bddd 100644 --- a/expat/makefile.mk +++ b/expat/makefile.mk @@ -55,6 +55,10 @@ CONFIGURE_ACTION= CONFIGURE_ACTION=.$/configure .ENDIF +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF + BUILD_DIR=lib BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) -- cgit From e5c37050bab08fdfc08febf5a243372686ef423d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 02:57:36 +0300 Subject: Drop unnecessary quotes around platform triplets --- expat/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'expat') diff --git a/expat/makefile.mk b/expat/makefile.mk index 6084cf54bddd..efcd82270ff4 100644 --- a/expat/makefile.mk +++ b/expat/makefile.mk @@ -56,7 +56,7 @@ CONFIGURE_ACTION=.$/configure .ENDIF .IF "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_DIR=lib -- cgit From 56f35e6b3924b0c36146c33dc8c7dcf2c04b39da Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 3 Jun 2011 13:27:35 +0300 Subject: Drop %_EXT% which was always empty --- expat/prj/d.lst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'expat') diff --git a/expat/prj/d.lst b/expat/prj/d.lst index 62e29c2c6005..887a0816a00f 100644 --- a/expat/prj/d.lst +++ b/expat/prj/d.lst @@ -1,15 +1,15 @@ -mkdir: %_DEST%\inc%_EXT%\external\expat -mkdir: %_DEST%\lib%_EXT%\x64 -..\%__SRC%\misc\build\expat-2.0.1\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h -..\%__SRC%\misc\build\expat-2.0.1\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h -..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib -..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib -..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib -..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a -..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a -..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a -..\%__SRC%\misc\_ooo_st_expat_xmltok.pdb %_DEST%\lib%_EXT%\_ooo_st_expat_xmltok.pdb -..\%__SRC%\misc\_ooo_st_expat_xmlparse.pdb %_DEST%\lib%_EXT%\_ooo_st_expat_xmlparse.pdb -..\%__SRC%\slb\x64\expat_xmltok.lib %_DEST%\lib%_EXT%\x64\expat_xmltok.lib -..\%__SRC%\slb\x64\expat_xmlparse.lib %_DEST%\lib%_EXT%\x64\expat_xmlparse.lib +mkdir: %_DEST%\inc\external\expat +mkdir: %_DEST%\lib\x64 +..\%__SRC%\misc\build\expat-2.0.1\lib\expat.h %_DEST%\inc\external\expat.h +..\%__SRC%\misc\build\expat-2.0.1\lib\expat_external.h %_DEST%\inc\external\expat_external.h +..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib\expat_xmltok.lib +..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib\expat_xmlparse.lib +..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib\ascii_expat_xmlparse.lib +..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib\libexpat_xmltok.a +..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib\libexpat_xmlparse.a +..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib\libascii_expat_xmlparse.a +..\%__SRC%\misc\_ooo_st_expat_xmltok.pdb %_DEST%\lib\_ooo_st_expat_xmltok.pdb +..\%__SRC%\misc\_ooo_st_expat_xmlparse.pdb %_DEST%\lib\_ooo_st_expat_xmlparse.pdb +..\%__SRC%\slb\x64\expat_xmltok.lib %_DEST%\lib\x64\expat_xmltok.lib +..\%__SRC%\slb\x64\expat_xmlparse.lib %_DEST%\lib\x64\expat_xmlparse.lib -- cgit From 78f9b77628e5288e47ad5de4722c4a69c6295406 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 09:07:30 +0300 Subject: Always compare CROSS_COMPILING explicitly to "YES" --- expat/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'expat') diff --git a/expat/makefile.mk b/expat/makefile.mk index efcd82270ff4..857468e4b4c7 100644 --- a/expat/makefile.mk +++ b/expat/makefile.mk @@ -55,7 +55,7 @@ CONFIGURE_ACTION= CONFIGURE_ACTION=.$/configure .ENDIF -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF -- cgit From db280c82e6c2bd809aae83527b6293851f3aedb7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 9 Jun 2011 21:51:30 +0300 Subject: First attempt at Android support --- expat/expat-2.0.1.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'expat') diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch index bea3d01e0c4f..6c09d34f4676 100644 --- a/expat/expat-2.0.1.patch +++ b/expat/expat-2.0.1.patch @@ -1,3 +1,14 @@ +--- misc/expat-2.0.1/conftools/config.sub ++++ misc/build/expat-2.0.1/conftools/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/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:33:55 2008 +++ misc/build/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:26:42 2008 @@ -1 +1,89 @@ -- cgit