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 /berkeleydb/db-4.7.25.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 'berkeleydb/db-4.7.25.patch')
| -rw-r--r-- | berkeleydb/db-4.7.25.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch index 8cf412d23e25..6077e6669c77 100644 --- a/berkeleydb/db-4.7.25.patch +++ b/berkeleydb/db-4.7.25.patch @@ -398,6 +398,17 @@ $(RM) -f $(libdb) $(LN) -s .libs/$(libdb_version) $(libdb) +--- misc/db-4.7.25.NC/dist/config.sub ++++ misc/build/db-4.7.25.NC/dist/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/db-4.7.25.NC/dist/configure 2008-05-15 23:12:41.000000000 +0200 +++ misc/build/db-4.7.25.NC/dist/configure 2009-07-21 11:39:25.000000000 +0200 @@ -3757,8 +3757,10 @@ |