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/expat-2.0.1.patch | |
| 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/expat-2.0.1.patch')
| -rw-r--r-- | expat/expat-2.0.1.patch | 11 |
1 files changed, 11 insertions, 0 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 @@ |