diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:03:35 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:03:35 +0200 |
| commit | 31daa1bd60b3d2118393752cbc1a1d44d9a802f7 (patch) | |
| tree | 562a19ceda25e5f0c7412acd089081933f9d7ba0 /expat | |
| parent | e512adbb0a83012da7ca76c7725c2c532f31b0e7 (diff) | |
| parent | 1d84afcf346e374980259718e26f48622b76aa5d (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
cairo/cairo-1.8.0.patch
cairo/prj/build.lst
gdk-pixbuf/makefile.mk
libcroco/makefile.mk
Diffstat (limited to 'expat')
| -rw-r--r-- | expat/expat-2.0.1.patch | 11 | ||||
| -rw-r--r-- | expat/makefile.mk | 4 | ||||
| -rw-r--r-- | expat/prj/d.lst | 28 |
3 files changed, 29 insertions, 14 deletions
diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch index 3ff1e2deb624..f168297ac03e 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,90 @@ diff --git a/expat/makefile.mk b/expat/makefile.mk index 867e2b371558..857468e4b4c7 100644 --- a/expat/makefile.mk +++ b/expat/makefile.mk @@ -55,6 +55,10 @@ CONFIGURE_ACTION= CONFIGURE_ACTION=.$/configure .ENDIF +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + BUILD_DIR=lib BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) 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 |