diff options
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/Makefile.am | 52 | ||||
| -rw-r--r-- | externals/bdb-cygwin.patch | 22 |
2 files changed, 4 insertions, 70 deletions
diff --git a/externals/Makefile.am b/externals/Makefile.am index 29d0db052189..7f68eee6cc65 100644 --- a/externals/Makefile.am +++ b/externals/Makefile.am @@ -1,46 +1,3 @@ -# Berkeley DB - -DB = db-4.5.20 - -if OLD_DB_COMPAT - -$(DB).tar.gz: - @echo "Nix requires Berkeley DB to build." - @echo "Please download version 4.5.20 from" - @echo " http://download-east.oracle.com/berkeley-db/db-4.5.20.tar.gz" - @echo "and place it in the externals/ directory." - false - -$(DB): $(DB).tar.gz - gunzip < $(srcdir)/$(DB).tar.gz | tar xvf - - (cd $(DB) && $(patch) -p1) < $(srcdir)/bdb-cygwin.patch - -have-db: - $(MAKE) $(DB) - touch have-db - -if HAVE_BDB -build-db: -else -build-db: have-db - (pfx=`pwd` && \ - cd $(DB)/build_unix && \ - CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - ../dist/configure --prefix=$$pfx/inst-bdb \ - --enable-cxx --disable-shared --disable-cryptography \ - --disable-replication --disable-verify && \ - $(MAKE) && \ - $(MAKE) install_include install_lib) - touch build-db -endif - -else - -build-db: - -endif - - # CWI ATerm ATERM = aterm-2.4.2-fixes-r2 @@ -107,11 +64,10 @@ install: endif -all: build-db build-aterm build-bzip2 +all: build-aterm build-bzip2 -EXTRA_DIST = $(DB).tar.gz $(ATERM).tar.bz2 $(BZIP2).tar.gz \ - bdb-cygwin.patch +EXTRA_DIST = $(ATERM).tar.bz2 $(BZIP2).tar.gz ext-clean: - $(RM) -f have-db build-db have-aterm build-aterm have-bzip2 build-bzip2 - $(RM) -rf $(DB) $(ATERM) $(BZIP2) + $(RM) -f have-aterm build-aterm have-bzip2 build-bzip2 + $(RM) -rf $(ATERM) $(BZIP2) diff --git a/externals/bdb-cygwin.patch b/externals/bdb-cygwin.patch deleted file mode 100644 index 3f0ee78a7085..000000000000 --- a/externals/bdb-cygwin.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rc db-4.5.20-orig/os/os_flock.c db-4.5.20/os/os_flock.c -*** db-4.5.20-orig/os/os_flock.c 2006-10-13 12:36:12.000000000 +0200 ---- db-4.5.20/os/os_flock.c 2006-10-13 12:40:11.000000000 +0200 -*************** -*** 30,35 **** ---- 30,44 ---- - - DB_ASSERT(dbenv, 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(dbenv, offset < (off_t) 1 << 62); -+ offset += (off_t) 1 << 62; -+ #endif -+ - fl.l_start = offset; - fl.l_len = 1; - fl.l_type = acquire ? F_WRLCK : F_UNLCK; -Only in db-4.5.20/os: os_flock.c~ |