Hi,

This diff adds a patch ( also in Gentoo[1] ), that 
fixes a build error with sqlite 3.6.11:

cc -shared  -fPIC -DPIC -o .libs/libsqlite3.so.13.1  .libs/alter.o 
.libs/analyze.o .libs/attach.o .libs/auth.o .libs/bitvec.o .libs/btmutex.o 
.libs/btree.o .libs/build.o .libs/callback.o .libs/complete.o .libs/date.o 
.libs/delete.o .libs/expr.o .libs/fault.o .libs/func.o .libs/global.o 
.libs/hash.o .libs/journal.o .libs/insert.o .libs/legacy.o .libs/loadext.o 
.libs/main.o .libs/malloc.o .libs/mem0.o .libs/mem1.o .libs/mem2.o .libs/mem3.o 
.libs/mem5.o .libs/memjournal.o .libs/mutex.o .libs/mutex_noop.o 
.libs/mutex_os2.o .libs/mutex_unix.o .libs/mutex_w32.o .libs/opcodes.o 
.libs/os.o .libs/os_unix.o .libs/os_win.o .libs/os_os2.o .libs/pager.o 
.libs/parse.o .libs/pcache.o .libs/pcache1.o .libs/pragma.o .libs/prepare.o 
.libs/printf.o .libs/random.o .libs/resolve.o .libs/rowset.o .libs/select.o 
.libs/status.o .libs/table.o .libs/tokenize.o .libs/trigger.o .libs/update.o 
.libs/util.o .libs/vacuum.o .libs/vdbe.o .libs/vdbeapi.o .libs/vdbeaux.o 
.libs/vdbeblob.o .libs/vdbemem.o .libs/walker.o .libs/where.o .libs/utf.o 
.libs/vtab.o .libs/pthread_stub.o   -pthread -pthread
ar cru .libs/libsqlite3.a  alter.o analyze.o attach.o auth.o bitvec.o btmutex.o 
btree.o build.o callback.o complete.o date.o delete.o expr.o fault.o func.o 
global.o hash.o journal.o insert.o legacy.o loadext.o main.o malloc.o mem0.o 
mem1.o mem2.o mem3.o mem5.o memjournal.o mutex.o mutex_noop.o mutex_os2.o 
mutex_unix.o mutex_w32.o opcodes.o os.o os_unix.o os_win.o os_os2.o pager.o 
parse.o pcache.o pcache1.o pragma.o prepare.o printf.o random.o resolve.o 
rowset.o select.o status.o table.o tokenize.o trigger.o update.o util.o 
vacuum.o vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o walker.o where.o utf.o 
vtab.o pthread_stub.o
ranlib .libs/libsqlite3.a
creating libsqlite3.la
(cd .libs && rm -f libsqlite3.la && ln -s ../libsqlite3.la libsqlite3.la)
/usr/local/bin/libtool  --mode=link cc   -O2 -pipe -DSQLITE_OS_UNIX=1 -I. 
-I./src -D_HAVE_SQLITE_CONFIG_H -DNDEBUG  -DSQLITE_THREADSAFE=1 
-DSQLITE_THREAD_OVERRIDE_LOCK=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 
-DSQLITE_ENABLE_COLUMN_METADATA     -DHAVE_READLINE=1 -I/usr/include/readline  
-o sqlite3 ./src/shell.c libsqlite3.la  -lreadline -lncurses -pthread -rpath 
"/usr/local/lib"
cc -O2 -pipe -DSQLITE_OS_UNIX=1 -I. -I./src -D_HAVE_SQLITE_CONFIG_H -DNDEBUG 
-DSQLITE_THREADSAFE=1 -DSQLITE_THREAD_OVERRIDE_LOCK=1 
-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_COLUMN_METADATA 
-DHAVE_READLINE=1 -I/usr/include/readline -o .libs/sqlite3 ./src/shell.c 
-pthread  -L./.libs -lsqlite3 -pthread -lreadline -lncurses  
-Wl,-rpath,/usr/local/lib
/tmp//ccsZ59Jm.o(.text+0x2121): In function `do_meta_command':
: undefined reference to `sqlite3_backup_init'
/tmp//ccsZ59Jm.o(.text+0x2139): In function `do_meta_command':
: undefined reference to `sqlite3_backup_step'
/tmp//ccsZ59Jm.o(.text+0x2170): In function `do_meta_command':
: undefined reference to `sqlite3_backup_finish'
/tmp//ccsZ59Jm.o(.text+0x320a): In function `do_meta_command':
: undefined reference to `sqlite3_backup_init'
/tmp//ccsZ59Jm.o(.text+0x321e): In function `do_meta_command':
: undefined reference to `sqlite3_backup_step'
/tmp//ccsZ59Jm.o(.text+0x3230): In function `do_meta_command':
: undefined reference to `sqlite3_backup_finish'
./.libs/libsqlite3.so.13.1: undefined reference to `sqlite3BtreeCopyFile'
./.libs/libsqlite3.so.13.1: undefined reference to `sqlite3BackupRestart'
./.libs/libsqlite3.so.13.1: undefined reference to `sqlite3BackupUpdate'
collect2: ld returned 1 exit status
*** Error code 1

Stop in /usr/ports/databases/sqlite3/w-sqlite-3.6.11/sqlite-3.6.11 (line 478 of 
Makefile).
*** Error code 1

Stop in /usr/ports/databases/sqlite3 (line 2172 of 
/usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1

Stop in /usr/ports/databases/sqlite3 (line 1427 of 
/usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1

Stop in /usr/ports/databases/sqlite3 (line 1967 of 
/usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1

Stop in /usr/ports/databases/sqlite3 (line 2983 of 
/usr/ports/infrastructure/mk/bsd.port.mk).


Please commit... Or is it better to wait for 3.6.12 inclusion in the ports tree?

Ciao, 
David

[1] 
http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/dev-db/sqlite/files/sqlite-3.6.11-reference.patch?rev=1.2


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/sqlite3/Makefile,v
retrieving revision 1.43
diff -N -u -p Makefile
--- Makefile    5 Apr 2009 00:02:53 -0000       1.43
+++ Makefile    14 Apr 2009 07:47:11 -0000
@@ -5,9 +5,9 @@ COMMENT-tcl=    TCL bindings for Sqlite3
 COMMENT-lemon= LEMON LALR(1) parser generator
 V=             3.6.11
 DISTNAME=      sqlite-${V}
-PKGNAME-main=  sqlite3-${V}
-PKGNAME-tcl=   sqlite3-tcl-${V}
-PKGNAME-lemon= lemon-${V}
+PKGNAME-main=  sqlite3-${V}p0
+PKGNAME-tcl=   sqlite3-tcl-${V}p0
+PKGNAME-lemon= lemon-${V}p0
 CATEGORIES=    databases
 SHARED_LIBS += sqlite3              13.1      # .8.6
 SHARED_LIBS += tclsqlite3           12.1      # .8.6
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/databases/sqlite3/patches/patch-Makefile_in,v
retrieving revision 1.12
diff -N -u -p patches/patch-Makefile_in
--- patches/patch-Makefile_in   5 Apr 2009 00:02:54 -0000       1.12
+++ patches/patch-Makefile_in   14 Apr 2009 07:47:11 -0000
@@ -1,6 +1,15 @@
 $OpenBSD: patch-Makefile_in,v 1.12 2009/04/05 00:02:54 martynas Exp $
---- Makefile.in.orig   Sun Feb 15 15:07:08 2009
-+++ Makefile.in        Sun Mar 22 13:28:08 2009
+--- Makefile.in.orig   Sun Feb 15 14:07:08 2009
++++ Makefile.in        Tue Apr 14 09:42:02 2009
+@@ -163,7 +163,7 @@ NAWK = @AWK@
+ 
+ # Object files for the SQLite library (non-amalgamation).
+ #
+-OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo \
++OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
+         btree.lo build.lo callback.lo complete.lo date.lo \
+         delete.lo expr.lo fault.lo func.lo global.lo \
+         hash.lo journal.lo insert.lo legacy.lo loadext.lo \
 @@ -176,11 +176,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.l
          table.lo tokenize.lo trigger.lo update.lo \
          util.lo vacuum.lo \
@@ -53,7 +62,17 @@ $OpenBSD: patch-Makefile_in,v 1.12 2009/04/05 00:02:54
  # Rules to build individual files
  #
  alter.lo:     $(TOP)/src/alter.c $(HDR)
-@@ -799,6 +803,8 @@ clean:     
+@@ -518,6 +522,9 @@ attach.lo: $(TOP)/src/attach.c $(HDR)
+ auth.lo:      $(TOP)/src/auth.c $(HDR)
+       $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/auth.c
+ 
++backup.lo:    $(TOP)/src/backup.c $(HDR)
++      $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/backup.c
++
+ bitvec.lo:    $(TOP)/src/bitvec.c $(HDR)
+       $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/bitvec.c
+ 
+@@ -799,6 +806,8 @@ clean:     
  
  distclean:    clean
        rm -f config.log config.status libtool Makefile sqlite3.pc

Reply via email to