OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Jan-2008 14:54:14
Branch: HEAD Handle: 2008010313541300
Modified files:
openpkg-src/sqlite sqlite.patch sqlite.spec
Log:
remove tcl requirement (again) by backporting upstream vendor patch
Summary:
Revision Changes Path
1.47 +19 -9 openpkg-src/sqlite/sqlite.patch
1.169 +2 -2 openpkg-src/sqlite/sqlite.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch
============================================================================
$ cvs diff -u -r1.46 -r1.47 sqlite.patch
--- openpkg-src/sqlite/sqlite.patch 2 Jan 2008 14:59:12 -0000 1.46
+++ openpkg-src/sqlite/sqlite.patch 3 Jan 2008 13:54:13 -0000 1.47
@@ -71,18 +71,28 @@
-Libs.private: -lpthread
+Libs: -L${libdir} -lsqlite3 @LIBS@
Cflags: -I${includedir}
-Index: Makefile.in
---- Makefile.in.orig Thu Dec 13 19:17:42 2007
-+++ Makefile.in Wed Jan 2 11:37:50 2008
-@@ -322,7 +322,7 @@
+Index: sqlite/Makefile.in
+--- Makefile.in 2007/12/13 18:20:46 1.191
++++ Makefile.in 2007/12/17 16:20:07 1.192
+@@ -317,17 +317,10 @@
+ -rpath $(libdir)/sqlite \
+ -version-info "8:6:8"
+
+-testcli$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
++sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
+ $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
-o $@ $(TOP)/src/shell.c libsqlite3.la \
$(LIBREADLINE) $(TLIBS)
-
+-
-sqlite3$(EXE): $(TOP)/src/shell.c sqlite3.c sqlite3.h
-+sqlite3$(TEXE): $(TOP)/src/shell.c sqlite3.c sqlite3.h
- $(LTLINK) $(READLINE_FLAGS) -o $@ \
- -DSQLITE_MAX_SQL_LENGTH=1000000000 \
- -USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0 \
+- $(LTLINK) $(READLINE_FLAGS) -o $@ \
+- -DSQLITE_MAX_SQL_LENGTH=1000000000 \
+- -USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0 \
+- $(TOP)/src/shell.c sqlite3.c \
+- $(LIBREADLINE) $(TLIBS) $(THREADLIB)
+
+ # This target creates a directory named "tsrc" and fills it with
+ # copies of all of the C source code and header files needed to
@@ -577,7 +577,7 @@
-e 's,$$,\\n",' \
$(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.spec
============================================================================
$ cvs diff -u -r1.168 -r1.169 sqlite.spec
--- openpkg-src/sqlite/sqlite.spec 2 Jan 2008 14:59:12 -0000 1.168
+++ openpkg-src/sqlite/sqlite.spec 3 Jan 2008 13:54:13 -0000 1.169
@@ -37,7 +37,7 @@
Group: Database
License: PD
Version: %{V_sqlite}
-Release: 20080102
+Release: 20080103
# package options
%option with_assert no
@@ -59,7 +59,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make, gawk, tcl
+BuildPreReq: OpenPKG, openpkg >= 20040130, make, gawk
PreReq: OpenPKG, openpkg >= 20040130
%if "%{with_readline}" == "yes"
BuildPreReq: readline, pkgconfig
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
