diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-08-25 11:09:20 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-08-25 11:09:20 +0000 |
| commit | 8376996e6553f0026390e64fbc1fd21106bf308b (patch) | |
| tree | 5a0c0174a94e5b1e8dc1603d4aad8a6ac831de8d | |
| parent | 041f0f710cbb29713dabb64a77522219279ed3d1 (diff) | |
CWS-TOOLING: integrate CWS jl123
2009-08-04 12:34:31 +0200 jl r274615 : #i103742# added note regarding Berkeley update
2009-07-27 11:24:49 +0200 jl r274351 : #i100916# applying tono's patch
2009-07-22 16:29:54 +0200 jl r274248 : CWS-TOOLING: rebase CWS jl123 to trunk@274203 (milestone: DEV300:m53)
2009-07-21 11:49:45 +0200 jl r274172 : #100916# syncing data base with fcntl( F_FULLSYNC) failed with an unexpected error on Mac when buiding on NFS. Although there is a fallback using fsync, it was not used because of the unexpected error
2009-07-20 09:35:42 +0200 jl r274107 : #i100916# Applied tono's second patch
2009-07-16 16:41:24 +0200 jl r274062 : i100916
2009-07-13 14:47:32 +0200 jl r273936 : #i100916# deliver libdb-47.lib
2009-07-13 11:03:26 +0200 jl r273921 : #i100916# applied tono's patches for mingw
2009-07-10 14:34:22 +0200 jl r273895 : #i100916# renamed mingw patch
2009-07-10 14:33:36 +0200 jl r273894 : #i100916# renamed mingw patch
2009-07-10 14:04:39 +0200 jl r273890 : #i100916# new patch
2009-07-10 11:39:54 +0200 jl r273882 : #i100916# updating berkeleydb
2009-07-10 11:03:16 +0200 jl r273880 : #i100916# updating berkeleydb
2009-07-02 12:52:53 +0200 jl r273638 : CWS-TOOLING: rebase CWS jl127 to trunk@273468 (milestone: DEV300:m51)
2009-04-08 13:32:52 +0200 jl r270642 : #i100916#
2009-04-08 13:25:15 +0200 jl r270639 : #i100916# new version of berkeleydb
2009-04-08 12:37:14 +0200 jl r270634 : #i100916# changes for version 4.7.25
2009-04-08 12:36:08 +0200 jl r270633 : #i100916# new patch file for version 4.7.25 (no encryption)
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 4 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 3304e3ed6ec6..f7ed5904e033 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -242,9 +242,9 @@ File gid_File_Lib_Db Styles = (PACKED); Dir = gid_Dir_Program; #ifdef UNX - Name = STRING(CONCAT2(libdb-4.2,UNXSUFFIX)); + Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX)); #else - Name = "libdb42.dll"; + Name = "libdb47.dll"; #endif End diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 200ea5b54462..a0a318230255 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -233,10 +233,8 @@ NEON3RDLIB=$(STATIC) -lneon $(DYNAMIC) .ENDIF .IF "$(SYSTEM_DB)" == "YES" BERKELEYLIB=-ldb -BERKELEYCPPLIB=-ldb_cxx .ELSE -BERKELEYLIB=-ldb-4.2 -BERKELEYCPPLIB=-ldb_cxx-4.2 +BERKELEYLIB=-ldb-4.7 .ENDIF CURLLIB=-lcurl SFX2LIB=-lsfx$(DLLPOSTFIX) @@ -446,8 +444,7 @@ EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib ZLIB3RDLIB=zlib.lib JPEG3RDLIB=jpeglib.lib NEON3RDLIB=neon.lib -BERKELEYLIB=libdb42.lib -BERKELEYCPPLIB= +BERKELEYLIB=libdb47.lib CURLLIB=libcurl.lib CHAOSLIB=ichaos.lib UUILIB=iuui.lib |