public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Patch for BDB on Cygwin.

Browse Source 
svn path=/nixpkgs/trunk/; revision=5454
This commit is contained in:
Eelco Dolstra 2006-06-15 12:51:15 +00:00
parent 089877f594
commit 26832cd4ec
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/cygwin.patch Normal file
View File

@ -0,0 +1,21 @@
diff -rc db-4.4.20.NC-old/os/os_flock.c db-4.4.20.NC/os/os_flock.c
*** db-4.4.20.NC-old/os/os_flock.c Mon Jun 20 16:59:01 2005
--- db-4.4.20.NC/os/os_flock.c Wed Jun 7 17:01:49 2006
***************
*** 36,41 ****
--- 36,50 ----
DB_ASSERT(F_ISSET(fhp, DB_FH_OPENED) && fhp->fd != -1);
+ #ifdef __CYGWIN__
+ /*
+ * Windows file locking interferes with read/write operations, so we
+ * map the ranges to an area past the end of the file.
+ */
+ DB_ASSERT(offset < (off_t) 1 << 62);
+ offset += (off_t) 1 << 62;
+ #endif
+
#ifdef HAVE_FCNTL
fl.l_start = offset;
fl.l_len = 1;

4
pkgs/development/libraries/db4/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}: {stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
stdenv.mkDerivation { stdenv.mkDerivation ({
name = "db4-4.4.20"; name = "db4-4.4.20";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
@ -11,4 +11,4 @@ stdenv.mkDerivation {
(if cxxSupport then "--enable-cxx" else "--disable-cxx") (if cxxSupport then "--enable-cxx" else "--disable-cxx")
(if cxxSupport then "--enable-compat185" else "--disable-compat185") (if cxxSupport then "--enable-compat185" else "--disable-compat185")
]; ];
} } // (if stdenv.system == "i686-cygwin" then {patches = [./cygwin.patch];} else {}))