Re: Building db4.0
On Fri, Oct 04, 2002 at 12:09:56PM +0200, Marcus Brinkmann wrote:
>
> procps | hurd is wrong, see
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=157076
>
I see.
This should be better:
diff -Nur db4.0-4.0.14.org/debian/control db4.0-4.0.14/debian/control
--- db4.0-4.0.14.org/debian/control Fri Oct 4 15:56:23 2002
+++ db4.0-4.0.14/debian/control Fri Oct 4 17:02:03 2002
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Matthew Wilcox <willy@debian.org>
-Build-Depends: debhelper (>= 2.1.26), tcl8.3-dev, autoconf, automake, binutils (>= 2.11.90.0.7-1), procps
+Build-Depends: debhelper (>= 2.1.26), tcl8.3-dev, autoconf, automake, binutils (>= 2.11.90.0.7-1), procps [!hurd-i386] | shellutils (>> 2.0.12-2) [hurd-i386], libdb3-dev | libdb4.0-dev
Standards-Version: 3.5.6.0
Package: libdb4.0-util
diff -Nur db4.0-4.0.14.org/debian/patches/001_db185_dump.diff db4.0-4.0.14/debian/patches/001_db185_dump.diff
--- db4.0-4.0.14.org/debian/patches/001_db185_dump.diff Fri Oct 4 15:56:21 2002
+++ db4.0-4.0.14/debian/patches/001_db185_dump.diff Fri Oct 4 14:45:10 2002
@@ -1,14 +1,24 @@
-diff -urN db-3.2.9.orig/dist/Makefile.in db-3.2.9/dist/Makefile.in
---- db-3.2.9.orig/dist/Makefile.in Thu Nov 30 18:07:33 2000
-+++ db-3.2.9/dist/Makefile.in Sun Mar 11 10:30:49 2001
-@@ -104,8 +104,8 @@
- # local libraries, for example. Do that by adding -I options to the DB185INC
+diff -urN db-4.0.14/db_dump185/db_dump185.c db-4.0.14.new/db_dump185/db_dump185.c
+--- db-4.0.14/db_dump185/db_dump185.c Mon Aug 20 00:06:41 2001
++++ db-4.0.14.new/db_dump185/db_dump185.c Fri Oct 4 11:23:32 2002
+@@ -21,7 +21,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include <db.h>
++#include <db_185.h>
+
+ /* Hash Table Information */
+ typedef struct hashhdr185 { /* Disk resident portion */
+diff -urN db-4.0.14/dist/db_dump185.c db-4.0.14.new/dist/db_dump185.c
+--- db-4.0.14/dist/Makefile.in Fri Oct 4 14:03:30 2002
++++ db-4.0.14.new/dist/Makefile.in Fri Oct 4 14:04:05 2002
+@@ -140,7 +140,7 @@
# line, and -l options to the DB185LIB line.
##################################################
--DB185INC= -c @CFLAGS@ -I$(srcdir)/include @CPPFLAGS@
+ DB185INC= -c @CFLAGS@ -I$(srcdir)/include @CPPFLAGS@
-DB185LIB=
-+DB185INC= -c @CFLAGS@ -I/usr/include/db1 @CPPFLAGS@
-+DB185LIB= -ldb1
++DB185LIB= -ldb
##################################################
- # INSTALLATION DIRECTORIES AND PERMISSIONS
+ # NOTHING BELOW THIS LINE SHOULD EVER NEED TO BE MODIFIED.
--
Michal Suchanek
hramrach@centrum.cz
Reply to: