NetBSD Problem Report #23828
Received: (qmail 28418 invoked by uid 605); 21 Dec 2003 17:30:37 -0000
Message-Id: <20031221173036.BD4BA11159@narn.netbsd.org>
Date: Sun, 21 Dec 2003 17:30:36 +0000 (UTC)
From: dotz@irc.pl
Sender: gnats-bugs-owner@NetBSD.org
Reply-To: dotz@irc.pl
To: gnats-bugs@gnats.NetBSD.org
Subject: databases/sqlite build fails on FreeBSD; trival fix
X-Send-Pr-Version: www-1.0
>Number: 23828
>Category: pkg
>Synopsis: databases/sqlite build fails on FreeBSD; trival fix
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: cjep
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Dec 21 17:31:01 +0000 2003
>Closed-Date: Mon Dec 29 20:04:14 +0000 2003
>Last-Modified: Tue Dec 30 14:17:00 +0000 2003
>Originator: Michal Pasternak
>Release: N/A
>Organization:
Good people with bad reputation
>Environment:
FreeBSD mainframe.w.lub.pl 4.9-RELEASE FreeBSD 4.9-RELEASE #0: Mon Oct 27 17:51:09 GMT 2003 root@freebsd-stable.sentex.ca:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Build fails because of lack of #include <sys/types.h>
>How-To-Repeat:
Obvious
>Fix:
Add the following lines as patches/patch-aa:
---------------------START HERE
$NetBSD$
--- ../sqlite/src/sqlite.h.in.orig Sun Dec 21 17:26:40 2003
+++ ../sqlite/src/sqlite.h.in Sun Dec 21 17:27:03 2003
@@ -18,6 +18,10 @@
#define _SQLITE_H_
#include <stdarg.h> /* Needed for the definition of va_list */
+#ifdef __FreeBSD__
+#include <sys/types.h> /* because sqliteInt.h fails */
+#endif
+
/*
** Make sure we can call this stuff from C++.
*/
---------------------------END HERE
... and apply the following diff:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/sqlite/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo 1 Aug 2003 14:22:18 -0000 1.12
+++ distinfo 21 Dec 2003 17:28:31 -0000
@@ -2,3 +2,4 @@
SHA1 (sqlite-2.8.5.tar.gz) = f7819edfb360a14155c61f6c61f644ac3e3c514b
Size (sqlite-2.8.5.tar.gz) = 817792 bytes
+SHA1 (patch-aa) = 1295e8bc34fb7a45beb6ab5e59b95072fc948a12
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->analyzed
State-Changed-By: cjep
State-Changed-When: Sun Dec 21 18:11:08 UTC 2003
State-Changed-Why:
I've looked at this -- seems reasonable.
Responsible-Changed-From-To: pkg-manager->cjep
Responsible-Changed-By: cjep
Responsible-Changed-When: Sun Dec 21 18:11:08 UTC 2003
Responsible-Changed-Why:
I'll take this one.
From: Chris Pinnock <cjep@fawlty.net>
To: dotz@irc.pl
Cc: gnats-bugs@gnats.NetBSD.org
Subject: Re: pkg/23828: databases/sqlite build fails on FreeBSD; trival fix
Date: Sun, 21 Dec 2003 18:21:01 +0000
On Sun, Dec 21, 2003 at 05:30:36PM +0000, dotz@irc.pl wrote:
> >Fix:
> Add the following lines as patches/patch-aa:
> ---------------------START HERE
> $NetBSD$
>
> --- ../sqlite/src/sqlite.h.in.orig Sun Dec 21 17:26:40 2003
> +++ ../sqlite/src/sqlite.h.in Sun Dec 21 17:27:03 2003
> @@ -18,6 +18,10 @@
> #define _SQLITE_H_
> #include <stdarg.h> /* Needed for the definition of va_list */
>
> +#ifdef __FreeBSD__
> +#include <sys/types.h> /* because sqliteInt.h fails */
> +#endif
> +
> /*
> ** Make sure we can call this stuff from C++.
> */
> ---------------------------END HERE
>
Hi,
sqlite/src/os.h includes sys/types.h for unices. Can you show me
where the header fails?
I think the order of inclusion in a few files is broken.
regards,
Chris
From: Michal Pasternak <michal@pasternak.w.lub.pl>
To: Chris Pinnock <cjep@fawlty.net>
Cc: dotz@irc.pl, gnats-bugs@gnats.NetBSD.org
Subject: Re: pkg/23828: databases/sqlite build fails on FreeBSD; trival fix
Date: Sun, 21 Dec 2003 18:26:21 +0100
Chris Pinnock [Sun, Dec 21, 2003 at 06:21:01PM +0000]:
> sqlite/src/os.h includes sys/types.h for unices. Can you show me
> where the header fails?
Here you are: the build without the patch:
on ../sqlite/tool/lemon.c
cp ../sqlite/tool/lempar.c .
cp ../sqlite/src/parse.y .
./lemon parse.y
./libtool cc -O2 -DUINT32_TYPE=u_int32_t -DUINT16_TYPE=u_int16_t -DUINT8_TYPE=u_int8_t -DINTPTR_TYPE=long -I/usr/pkg/include -DOS_UNIX=1 -DOS_WIN=0 -DHAVE_USLEEP=1 -I. -I../sqlite/src -Ino/generic -Ino/unix -c ../sqlite/src/attach.c
mkdir .libs
cc -O2 -DUINT32_TYPE=u_int32_t -DUINT16_TYPE=u_int16_t -DUINT8_TYPE=u_int8_t -DINTPTR_TYPE=long -I/usr/pkgsrc/databases/sqlite/work/.buildlink/include -DOS_UNIX=1 -DOS_WIN=0 -DHAVE_USLEEP=1 -I. -I../sqlite/src -Ino/generic -Ino/unix -c ../sqlite/src/attach.c -fPIC -DPIC -o .libs/attach.o
In file included from ../sqlite/src/attach.c:16:
../sqlite/src/sqliteInt.h:114: syntax error before `u32'
../sqlite/src/sqliteInt.h:114: warning: data definition has no type or storage class
../sqlite/src/sqliteInt.h:115: syntax error before `u16'
../sqlite/src/sqliteInt.h:115: warning: data definition has no type or storage class
../sqlite/src/sqliteInt.h:116: syntax error before `u8'
../sqlite/src/sqliteInt.h:116: warning: data definition has no type or storage class
../sqlite/src/sqliteInt.h:244: syntax error before `u8'
../sqlite/src/sqliteInt.h:305: syntax error before `u8'
../sqlite/src/sqliteInt.h:385: syntax error before `u8'
../sqlite/src/sqliteInt.h:442: syntax error before `u8'
../sqlite/src/sqliteInt.h:486: syntax error before `u8'
../sqlite/src/sqliteInt.h:563: syntax error before `u8'
../sqlite/src/sqliteInt.h:614: syntax error before `u8'
../sqlite/src/sqliteInt.h:659: syntax error before `u8'
../sqlite/src/sqliteInt.h:782: syntax error before `u8'
../sqlite/src/sqliteInt.h:851: syntax error before `u8'
../sqlite/src/sqliteInt.h:898: syntax error before `u8'
../sqlite/src/attach.c: In function `sqliteAttach':
../sqlite/src/attach.c:32: structure has no member named `explain'
../sqlite/src/attach.c:34: structure has no member named `file_format'
../sqlite/src/attach.c: In function `sqliteDetach':
../sqlite/src/attach.c:113: structure has no member named `explain'
gmake: *** [attach.lo] Błąd 1
*** Error code 2
Stop.
bmake: stopped in /usr/pkgsrc/databases/sqlite
*** Error code 1
Stop.
bmake: stopped in /usr/pkgsrc/databases/sqlite
--
Michal Pasternak :: http://pasternak.w.lub.pl :: http://winsrc.sf.net
From: Michal Pasternak <michal@pasternak.w.lub.pl>
To: Chris Pinnock <cjep@fawlty.net>
Cc: Michal Pasternak <michal@pasternak.w.lub.pl>, gnats-bugs@gnats.NetBSD.org
Subject: Re: pkg/23828: databases/sqlite build fails on FreeBSD; trival fix
Date: Sun, 21 Dec 2003 20:06:17 +0100
Chris Pinnock [Sun, Dec 21, 2003 at 07:37:57PM +0000]:
> On Sun, Dec 21, 2003 at 06:26:21PM +0100, Michal Pasternak wrote:
> > Chris Pinnock [Sun, Dec 21, 2003 at 06:21:01PM +0000]:
> > > sqlite/src/os.h includes sys/types.h for unices. Can you show me
> > > where the header fails?
> >
>
> Can you try adding #include "os.h" to sqllite/src/attach.c ?
Of course it won't work, because sqliteInt.h is included on the first place
of almost EVERY .c file in sqlite directory. You should know that.
Please mind, that I'd REALLY like to keep our discussion world-readable to
other pkgsrc developers, using GNATS.
Here are the diffs, fixing sqlite includes. Mind, that they were tested only
on FreeBSD.
diff -ur work/sqlite/src/attach.c sqlite/src/attach.c
--- work/sqlite/src/attach.c Sat Jun 14 14:04:08 2003
+++ sqlite/src/attach.c Sun Dec 21 19:59:16 2003
@@ -13,6 +13,7 @@
**
** $Id: attach.c,v 1.7 2003/06/14 12:04:08 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/auth.c sqlite/src/auth.c
--- work/sqlite/src/auth.c Sat May 10 05:36:54 2003
+++ sqlite/src/auth.c Sun Dec 21 19:59:16 2003
@@ -16,6 +16,7 @@
**
** $Id: auth.c,v 1.10 2003/05/10 03:36:54 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/btree.c sqlite/src/btree.c
--- work/sqlite/src/btree.c Tue Jun 17 04:57:18 2003
+++ sqlite/src/btree.c Sun Dec 21 19:59:16 2003
@@ -49,6 +49,7 @@
** BTree begins on page 2 of the file. (Pages are numbered beginning with
** 1, not 0.) Thus a minimum database contains 2 pages.
*/
+#include "os.h"
#include "sqliteInt.h"
#include "pager.h"
#include "btree.h"
diff -ur work/sqlite/src/btree_rb.c sqlite/src/btree_rb.c
--- work/sqlite/src/btree_rb.c Sun Jun 29 20:29:48 2003
+++ sqlite/src/btree_rb.c Sun Dec 21 19:59:16 2003
@@ -16,6 +16,7 @@
**
** It was contributed to SQLite by anonymous on 2003-Feb-04 23:24:49 UTC.
*/
+#include "os.h"
#include "btree.h"
#include "sqliteInt.h"
#include <assert.h>
diff -ur work/sqlite/src/build.c sqlite/src/build.c
--- work/sqlite/src/build.c Tue Jul 1 20:13:15 2003
+++ sqlite/src/build.c Sun Dec 21 19:59:16 2003
@@ -25,6 +25,7 @@
**
** $Id: build.c,v 1.156 2003/07/01 18:13:15 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
#include <ctype.h>
diff -ur work/sqlite/src/copy.c sqlite/src/copy.c
--- work/sqlite/src/copy.c Tue Jun 3 00:50:26 2003
+++ sqlite/src/copy.c Sun Dec 21 19:59:16 2003
@@ -13,6 +13,7 @@
**
** $Id: copy.c,v 1.6 2003/06/02 22:50:26 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/delete.c sqlite/src/delete.c
--- work/sqlite/src/delete.c Sat May 17 19:35:11 2003
+++ sqlite/src/delete.c Sun Dec 21 19:59:16 2003
@@ -14,6 +14,7 @@
**
** $Id: delete.c,v 1.57 2003/05/17 17:35:11 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/expr.c sqlite/src/expr.c
--- work/sqlite/src/expr.c Sun Jul 20 03:16:47 2003
+++ sqlite/src/expr.c Sun Dec 21 19:59:16 2003
@@ -14,6 +14,7 @@
**
** $Id: expr.c,v 1.97 2003/07/20 01:16:47 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
#include <ctype.h>
diff -ur work/sqlite/src/func.c sqlite/src/func.c
--- work/sqlite/src/func.c Sat Jun 28 18:20:23 2003
+++ sqlite/src/func.c Sun Dec 21 19:59:16 2003
@@ -22,6 +22,7 @@
#include <math.h>
#include <stdlib.h>
#include <assert.h>
+#include "os.h"
#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/hash.c sqlite/src/hash.c
--- work/sqlite/src/hash.c Tue May 13 01:06:53 2003
+++ sqlite/src/hash.c Sun Dec 21 19:59:16 2003
@@ -14,6 +14,7 @@
**
** $Id: hash.c,v 1.10 2003/05/12 23:06:53 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
#include <assert.h>
diff -ur work/sqlite/src/insert.c sqlite/src/insert.c
--- work/sqlite/src/insert.c Wed Jun 4 18:24:39 2003
+++ sqlite/src/insert.c Sun Dec 21 19:59:16 2003
@@ -14,6 +14,7 @@
**
** $Id: insert.c,v 1.88 2003/06/04 16:24:39 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/main.c sqlite/src/main.c
--- work/sqlite/src/main.c Tue Jul 22 15:05:10 2003
+++ sqlite/src/main.c Sun Dec 21 19:59:16 2003
@@ -16,8 +16,8 @@
**
** $Id: main.c,v 1.139 2003/07/22 09:24:45 danielk1977 Exp $
*/
-#include "sqliteInt.h"
#include "os.h"
+#include "sqliteInt.h"
#include <ctype.h>
/*
diff -ur work/sqlite/src/parse.y sqlite/src/parse.y
--- work/sqlite/src/parse.y Wed Jul 16 04:19:38 2003
+++ sqlite/src/parse.y Sun Dec 21 19:59:16 2003
@@ -33,6 +33,7 @@
}
%name sqliteParser
%include {
+#include "os.h"
#include "sqliteInt.h"
#include "parse.h"
diff -ur work/sqlite/src/pragma.c sqlite/src/pragma.c
--- work/sqlite/src/pragma.c Mon Jun 16 01:42:24 2003
+++ sqlite/src/pragma.c Sun Dec 21 19:59:16 2003
@@ -13,6 +13,7 @@
**
** $Id: pragma.c,v 1.10 2003/06/15 23:42:24 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
#include <ctype.h>
diff -ur work/sqlite/src/printf.c sqlite/src/printf.c
--- work/sqlite/src/printf.c Mon Jun 16 05:08:19 2003
+++ sqlite/src/printf.c Sun Dec 21 19:59:16 2003
@@ -46,6 +46,7 @@
** + All functions are fully reentrant.
**
*/
+#include "os.h"
#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/random.c sqlite/src/random.c
--- work/sqlite/src/random.c Tue Feb 19 14:39:23 2002
+++ sqlite/src/random.c Sun Dec 21 19:59:16 2003
@@ -17,8 +17,8 @@
**
** $Id: random.c,v 1.10 2002/02/19 13:39:23 drh Exp $
*/
-#include "sqliteInt.h"
#include "os.h"
+#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/select.c sqlite/src/select.c
--- work/sqlite/src/select.c Sun Jul 20 03:16:47 2003
+++ sqlite/src/select.c Sun Dec 21 19:59:16 2003
@@ -14,6 +14,7 @@
**
** $Id: select.c,v 1.145 2003/07/20 01:16:47 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
diff -ur work/sqlite/src/table.c sqlite/src/table.c
--- work/sqlite/src/table.c Sat May 17 02:05:50 2003
+++ sqlite/src/table.c Sun Dec 21 19:59:16 2003
@@ -18,6 +18,7 @@
*/
#include <stdlib.h>
#include <string.h>
+#include "os.h"
#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/tokenize.c sqlite/src/tokenize.c
--- work/sqlite/src/tokenize.c Sun May 4 20:30:59 2003
+++ sqlite/src/tokenize.c Sun Dec 21 19:59:17 2003
@@ -17,8 +17,8 @@
**
** $Id: tokenize.c,v 1.60 2003/05/04 18:30:59 drh Exp $
*/
-#include "sqliteInt.h"
#include "os.h"
+#include "sqliteInt.h"
#include <ctype.h>
#include <stdlib.h>
diff -ur work/sqlite/src/trigger.c sqlite/src/trigger.c
--- work/sqlite/src/trigger.c Tue Jun 3 03:47:11 2003
+++ sqlite/src/trigger.c Sun Dec 21 19:59:17 2003
@@ -10,6 +10,7 @@
*************************************************************************
*
*/
+#include "os.h"
#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/update.c sqlite/src/update.c
--- work/sqlite/src/update.c Sun Jun 1 03:10:33 2003
+++ sqlite/src/update.c Sun Dec 21 19:59:17 2003
@@ -14,6 +14,7 @@
**
** $Id: update.c,v 1.67 2003/06/01 01:10:33 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
/*
diff -ur work/sqlite/src/util.c sqlite/src/util.c
--- work/sqlite/src/util.c Thu Jun 5 16:27:56 2003
+++ sqlite/src/util.c Sun Dec 21 19:59:17 2003
@@ -16,6 +16,7 @@
**
** $Id: util.c,v 1.65 2003/06/05 14:27:56 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
#include <stdarg.h>
#include <ctype.h>
diff -ur work/sqlite/src/vacuum.c sqlite/src/vacuum.c
--- work/sqlite/src/vacuum.c Tue May 13 02:21:59 2003
+++ sqlite/src/vacuum.c Sun Dec 21 19:59:17 2003
@@ -16,8 +16,9 @@
**
** $Id: vacuum.c,v 1.7 2003/05/13 00:21:59 drh Exp $
*/
-#include "sqliteInt.h"
#include "os.h"
+#include "sqliteInt.h"
+
/*
** A structure for holding a dynamic string - a string that can grow
diff -ur work/sqlite/src/vdbe.c sqlite/src/vdbe.c
--- work/sqlite/src/vdbe.c Tue Jul 22 15:05:10 2003
+++ sqlite/src/vdbe.c Sun Dec 21 19:59:17 2003
@@ -38,8 +38,8 @@
**
** $Id: vdbe.c,v 1.234 2003/07/22 09:24:45 danielk1977 Exp $
*/
-#include "sqliteInt.h"
#include "os.h"
+#include "sqliteInt.h"
#include <ctype.h>
/*
diff -ur work/sqlite/src/where.c sqlite/src/where.c
--- work/sqlite/src/where.c Wed Jul 16 02:54:31 2003
+++ sqlite/src/where.c Sun Dec 21 19:59:17 2003
@@ -14,6 +14,7 @@
**
** $Id: where.c,v 1.81 2003/07/16 00:54:31 drh Exp $
*/
+#include "os.h"
#include "sqliteInt.h"
/*
--
Michal Pasternak :: http://pasternak.w.lub.pl :: http://winsrc.sf.net
From: Chris Pinnock <cjep@fawlty.net>
To: Michal Pasternak <michal@pasternak.w.lub.pl>
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/23828: databases/sqlite build fails on FreeBSD; trival fix
Date: Mon, 22 Dec 2003 14:01:40 +0000
On Sun, Dec 21, 2003 at 08:06:17PM +0100, Michal Pasternak wrote:
> Chris Pinnock [Sun, Dec 21, 2003 at 07:37:57PM +0000]:
> > On Sun, Dec 21, 2003 at 06:26:21PM +0100, Michal Pasternak wrote:
> > > Chris Pinnock [Sun, Dec 21, 2003 at 06:21:01PM +0000]:
> > > > sqlite/src/os.h includes sys/types.h for unices. Can you show me
> > > > where the header fails?
> > >
> >
> > Can you try adding #include "os.h" to sqllite/src/attach.c ?
>
> Of course it won't work, because sqliteInt.h is included on the first place
> of almost EVERY .c file in sqlite directory. You should know that.
>
> Please mind, that I'd REALLY like to keep our discussion world-readable to
> other pkgsrc developers, using GNATS.
I don't really understand why you are annoyed, but so sorry to have
offended you.
From: Michal Pasternak <michal@pasternak.w.lub.pl>
To: Chris Pinnock <cjep@fawlty.net>
Cc: Michal Pasternak <michal@pasternak.w.lub.pl>, gnats-bugs@netbsd.org
Subject: Re: pkg/23828: databases/sqlite build fails on FreeBSD; trival fix
Date: Sun, 28 Dec 2003 21:30:37 +0100
Could you please tell me what is the status of this PR, eg. what are you
currently working on?
State-Changed-From-To: analyzed->closed
State-Changed-By: cjep
State-Changed-When: Mon Dec 29 20:03:46 UTC 2003
State-Changed-Why:
Closed as per suggestion.
From: Chris Pinnock <cjep@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: pr/23828 CVS commit: pkgsrc/databases/sqlite
Date: Mon, 29 Dec 2003 20:03:31 +0000 (UTC)
Module Name: pkgsrc
Committed By: cjep
Date: Mon Dec 29 20:03:31 UTC 2003
Modified Files:
pkgsrc/databases/sqlite: distinfo
Added Files:
pkgsrc/databases/sqlite/patches: patch-aa patch-ab patch-ac patch-ad
patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak
patch-al patch-am patch-an patch-ao patch-ap patch-aq patch-ar
patch-as patch-at
Log Message:
Add #include's necessary for this to build on FreeBSD.
From Michal Pasternak in PR#23828.
To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 pkgsrc/databases/sqlite/distinfo
cvs rdiff -r0 -r1.4 pkgsrc/databases/sqlite/patches/patch-aa \
pkgsrc/databases/sqlite/patches/patch-ab
cvs rdiff -r0 -r1.3 pkgsrc/databases/sqlite/patches/patch-ac \
pkgsrc/databases/sqlite/patches/patch-ad \
pkgsrc/databases/sqlite/patches/patch-ae \
pkgsrc/databases/sqlite/patches/patch-af \
pkgsrc/databases/sqlite/patches/patch-ag
cvs rdiff -r0 -r1.1 pkgsrc/databases/sqlite/patches/patch-ah \
pkgsrc/databases/sqlite/patches/patch-ai \
pkgsrc/databases/sqlite/patches/patch-aj \
pkgsrc/databases/sqlite/patches/patch-ak \
pkgsrc/databases/sqlite/patches/patch-al \
pkgsrc/databases/sqlite/patches/patch-am \
pkgsrc/databases/sqlite/patches/patch-an \
pkgsrc/databases/sqlite/patches/patch-ao \
pkgsrc/databases/sqlite/patches/patch-ap \
pkgsrc/databases/sqlite/patches/patch-aq \
pkgsrc/databases/sqlite/patches/patch-ar \
pkgsrc/databases/sqlite/patches/patch-as \
pkgsrc/databases/sqlite/patches/patch-at
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
From: Michal Pasternak <michal@pasternak.w.lub.pl>
To: Michal Pasternak <michal@pasternak.w.lub.pl>
Cc: Chris Pinnock <cjep@fawlty.net>, gnats-bugs@netbsd.org
Subject: Re: pkg/23828: databases/sqlite build fails on FreeBSD; trival fix
Date: Tue, 30 Dec 2003 13:16:47 +0100
Thanks for the commit, but either I am using an outdated CVS mirror,
or you missed patches for vdbe.c, main.c, tokenize.c, random.c and vacuum.c
Here they are:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/sqlite/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 2003/12/29 20:03:31 1.13
+++ distinfo 2003/12/30 13:13:13
@@ -22,3 +22,8 @@
SHA1 (patch-ar) = b379e6e9426fc5b273153af83a511db79a70883d
SHA1 (patch-as) = f7513459ed3083ffdea162597709f1a924eb1e29
SHA1 (patch-at) = b28e643bd51229de052181278d46d41a2bfb879e
+SHA1 (patch-au) = 3f47d43e961fa5f34316ba4b0f6dc54f99c6d5b7
+SHA1 (patch-av) = 18a2e06f8d5ded8f28ebf9a3156403f869bdc522
+SHA1 (patch-aw) = b7d2fca97f783128f3305553b090c9d0ab91ce7b
+SHA1 (patch-ax) = 83a3ef1b7be0cff869d7b07d2f33e7e62aba3a2d
+SHA1 (patch-ay) = 537c0ef80520b94c68a2aec436348857ca017a27
Index: patches/patch-au
===================================================================
RCS file: patch-au
diff -N patch-au
--- /dev/null Thu Jul 11 11:18:53 2002
+++ patch-au Tue Dec 30 13:13:13 2003
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- ../sqlite/src/vdbe.c.orig Tue Dec 30 13:07:56 2003
++++ ../sqlite/src/vdbe.c Tue Dec 30 13:08:38 2003
+@@ -38,8 +38,8 @@
+ **
+ ** $Id: vdbe.c,v 1.234 2003/07/22 09:24:45 danielk1977 Exp $
+ */
+-#include "sqliteInt.h"
+ #include "os.h"
++#include "sqliteInt.h"
+ #include <ctype.h>
+
+ /*
Index: patches/patch-av
===================================================================
RCS file: patch-av
diff -N patch-av
--- /dev/null Thu Jul 11 11:18:53 2002
+++ patch-av Tue Dec 30 13:13:13 2003
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- ../sqlite/src/main.c.orig Tue Dec 30 13:07:51 2003
++++ ../sqlite/src/main.c Tue Dec 30 13:08:47 2003
+@@ -16,8 +16,8 @@
+ **
+ ** $Id: main.c,v 1.139 2003/07/22 09:24:45 danielk1977 Exp $
+ */
+-#include "sqliteInt.h"
+ #include "os.h"
++#include "sqliteInt.h"
+ #include <ctype.h>
+
+ /*
Index: patches/patch-aw
===================================================================
RCS file: patch-aw
diff -N patch-aw
--- /dev/null Thu Jul 11 11:18:53 2002
+++ patch-aw Tue Dec 30 13:13:13 2003
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- ../sqlite/src/tokenize.c.orig Tue Dec 30 13:08:20 2003
++++ ../sqlite/src/tokenize.c Tue Dec 30 13:08:45 2003
+@@ -17,8 +17,8 @@
+ **
+ ** $Id: tokenize.c,v 1.60 2003/05/04 18:30:59 drh Exp $
+ */
+-#include "sqliteInt.h"
+ #include "os.h"
++#include "sqliteInt.h"
+ #include <ctype.h>
+ #include <stdlib.h>
+
Index: patches/patch-ax
===================================================================
RCS file: patch-ax
diff -N patch-ax
--- /dev/null Thu Jul 11 11:18:53 2002
+++ patch-ax Tue Dec 30 13:13:13 2003
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- ../sqlite/src/random.c.orig Tue Dec 30 13:08:04 2003
++++ ../sqlite/src/random.c Tue Dec 30 13:08:42 2003
+@@ -17,8 +17,8 @@
+ **
+ ** $Id: random.c,v 1.10 2002/02/19 13:39:23 drh Exp $
+ */
+-#include "sqliteInt.h"
+ #include "os.h"
++#include "sqliteInt.h"
+
+
+ /*
Index: patches/patch-ay
===================================================================
RCS file: patch-ay
diff -N patch-ay
--- /dev/null Thu Jul 11 11:18:53 2002
+++ patch-ay Tue Dec 30 13:13:13 2003
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- ../sqlite/src/vacuum.c~ Tue May 13 02:21:59 2003
++++ ../sqlite/src/vacuum.c Tue Dec 30 13:12:40 2003
+@@ -16,8 +16,8 @@
+ **
+ ** $Id: vacuum.c,v 1.7 2003/05/13 00:21:59 drh Exp $
+ */
+-#include "sqliteInt.h"
+ #include "os.h"
++#include "sqliteInt.h"
+
+ /*
+ ** A structure for holding a dynamic string - a string that can grow
From: Chris Pinnock <cjep@fawlty.net>
To: Michal Pasternak <michal@pasternak.w.lub.pl>
Cc: Chris Pinnock <cjep@fawlty.net>, gnats-bugs@netbsd.org
Subject: Re: pkg/23828: databases/sqlite build fails on FreeBSD; trival fix
Date: Tue, 30 Dec 2003 14:10:50 +0000
On Tue, Dec 30, 2003 at 01:16:47PM +0100, Michal Pasternak wrote:
> Thanks for the commit, but either I am using an outdated CVS mirror,
> or you missed patches for vdbe.c, main.c, tokenize.c, random.c and vacuum.c
> +-#include "sqliteInt.h"
> + #include "os.h"
> ++#include "sqliteInt.h"
> + #include <ctype.h>
Hi,
Does the order definitely matter here? i.e. does the software not build
on FreeBSD with the headers in sqliteInt.h and then os.h order? If so, I'll
commit at some point today.
Regards,
Chris
From: Michal Pasternak <michal@pasternak.w.lub.pl>
To: Chris Pinnock <cjep@fawlty.net>
Cc: Michal Pasternak <michal@pasternak.w.lub.pl>, gnats-bugs@netbsd.org
Subject: Re: pkg/23828: databases/sqlite build fails on FreeBSD; trival fix
Date: Tue, 30 Dec 2003 14:17:14 +0100
Chris Pinnock [Tue, Dec 30, 2003 at 02:10:50PM +0000]:
> Does the order definitely matter here?
Yes.
> i.e. does the software not build
> on FreeBSD with the headers in sqliteInt.h and then os.h order?
Yes.
> If so, I'll
> commit at some point today.
Yes, please.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.