diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-30 11:12:09 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-30 11:14:39 +0200 |
| commit | 9c117d08ba22c998f2f6fd6c61dc96d043c32d64 (patch) | |
| tree | 521a9addc7f247bfba851ad535277b165c94aef6 /berkeleydb/makefile.mk | |
| parent | WaE: format '%i' expects type 'int', but argument has type 'long int' (diff) | |
| download | core-9c117d08ba22c998f2f6fd6c61dc96d043c32d64.tar.gz core-9c117d08ba22c998f2f6fd6c61dc96d043c32d64.zip | |
MinGW: work around _FILE_OFFSET_BITS incomp between Berkeleydb and LO
Diffstat (limited to 'berkeleydb/makefile.mk')
| -rw-r--r-- | berkeleydb/makefile.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 082170c70c7f..6a5809ad7cc9 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -59,6 +59,12 @@ ADDITIONAL_FILES= \ # not needed for win32. comment out when causing problems... .IF "$(GUI)$(COM)"=="WNTGCC" PATCH_FILES=db-4.7.25-mingw.patch +PATCH_FILES += db-4.7.25.NC-mingw32hack.patch + # otherwise, db-4.7.25.NC/dist/configure decides for _FILE_OFFSET_BITS=64, + # which causes /usr/i686-w64-mingw32/sys-root/mingw/include/_mingw.h to not + # define _USE_32BIT_TIME_T, so that berkeleydb uses a 64 bit time_t while + # the rest of LibreOffice uses a 32 bit time_t, which causes problems as + # there is e.g. a member time_t timestamp of struct __db in db.h .ELSE PATCH_FILES=\ db-4.7.25.patch \ |