openpkg/sqlite.patch@914043724d20 (annotated)
openpkg/sqlite.patch
Sat, 06 Oct 2012 16:24:01 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 06 Oct 2012 16:24:01 +0200
- changeset 727
- 914043724d20
- permissions
- -rw-r--r--
Update to new vendor software version and adjust patch code accordingly.
Unfortunately the vendor has apparently failed to properly test this
release which depends on missing object symbols in libsasl2.a(common.o):
undefined reference to `sasl_randcreate'
undefined reference to `sasl_mkchal'
undefined reference to `sasl_utf8verify'
undefined reference to `sasl_rand'
undefined reference to `sasl_churn'
undefined reference to `sasl_encode64'
undefined reference to `sasl_decode64'
undefined reference to `sasl_erasebuffer'
undefined reference to `sasl_randfree'
undefined reference to `sasl_strlower'
undefined reference to `get_fqhostname'
...yet to be patched.
| michael@428 | 1 | Index: Makefile.in |
| michael@428 | 2 | --- Makefile.in.orig 2009-07-06 16:29:57 +0200 |
| michael@428 | 3 | +++ Makefile.in 2009-08-12 20:12:13 +0200 |
| michael@428 | 4 | @@ -187,6 +187,17 @@ |
| michael@428 | 5 | USE_AMALGAMATION = @USE_AMALGAMATION@ |
| michael@428 | 6 | LIBOBJ = $(OBJS$(USE_AMALGAMATION)) |
| michael@428 | 7 | |
| michael@428 | 8 | +# FTS3 support |
| michael@428 | 9 | +ifdef FTS3 |
| michael@428 | 10 | +TCC += -DSQLITE_ENABLE_FTS3 -I$(TOP)/ext/fts3 |
| michael@428 | 11 | +LIBOBJ += fts3.lo fts3_hash.lo fts3_expr.lo fts3_porter.lo fts3_icu.lo fts3_tokenizer1.lo fts3_tokenizer.lo |
| michael@428 | 12 | +endif |
| michael@428 | 13 | + |
| michael@428 | 14 | +# RTREE support |
| michael@428 | 15 | +ifdef RTREE |
| michael@428 | 16 | +TCC += -DSQLITE_ENABLE_RTREE -I$(TOP)/ext/rtree |
| michael@428 | 17 | +LIBOBJ += rtree.lo |
| michael@428 | 18 | +endif |
| michael@428 | 19 | |
| michael@428 | 20 | # All of the source code files. |
| michael@428 | 21 | # |
| michael@428 | 22 | @@ -477,6 +488,24 @@ |
| michael@428 | 23 | -o $@ $(TOP)/src/shell.c libsqlite3.la \ |
| michael@428 | 24 | $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" |
| michael@428 | 25 | |
| michael@428 | 26 | +fts3.lo: $(TOP)/ext/fts3/fts3.c $(HDR) |
| michael@428 | 27 | + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3.c |
| michael@428 | 28 | +fts3_hash.lo: $(TOP)/ext/fts3/fts3_hash.c $(HDR) |
| michael@428 | 29 | + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_hash.c |
| michael@428 | 30 | +fts3_expr.lo: $(TOP)/ext/fts3/fts3_expr.c $(HDR) |
| michael@428 | 31 | + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_expr.c |
| michael@428 | 32 | +fts3_icu.lo: $(TOP)/ext/fts3/fts3_icu.c $(HDR) |
| michael@428 | 33 | + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_icu.c |
| michael@428 | 34 | +fts3_porter.lo: $(TOP)/ext/fts3/fts3_porter.c $(HDR) |
| michael@428 | 35 | + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_porter.c |
| michael@428 | 36 | +fts3_tokenizer.lo: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) |
| michael@428 | 37 | + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer.c |
| michael@428 | 38 | +fts3_tokenizer1.lo: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR) |
| michael@428 | 39 | + $(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c |
| michael@428 | 40 | + |
| michael@428 | 41 | +rtree.lo: $(TOP)/ext/rtree/rtree.c $(HDR) |
| michael@428 | 42 | + $(LTCOMPILE) -c $(TOP)/ext/rtree/rtree.c |
| michael@428 | 43 | + |
| michael@428 | 44 | # This target creates a directory named "tsrc" and fills it with |
| michael@428 | 45 | # copies of all of the C source code and header files needed to |
| michael@428 | 46 | # build on the target system. Some of the C source code and header |
| michael@428 | 47 | Index: configure |
| michael@428 | 48 | --- configure.orig 2009-08-01 17:04:20 +0200 |
| michael@428 | 49 | +++ configure 2009-08-12 20:12:13 +0200 |
| michael@428 | 50 | @@ -6012,11 +6012,7 @@ |
| michael@428 | 51 | if $ac_preproc_ok; then |
| michael@428 | 52 | : |
| michael@428 | 53 | else |
| michael@428 | 54 | - { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check |
| michael@428 | 55 | -See \`config.log' for more details." >&5 |
| michael@428 | 56 | -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check |
| michael@428 | 57 | -See \`config.log' for more details." >&2;} |
| michael@428 | 58 | - { (exit 1); exit 1; }; } |
| michael@428 | 59 | + : |
| michael@428 | 60 | fi |
| michael@428 | 61 | |
| michael@428 | 62 | ac_ext=c |
| michael@428 | 63 | Index: sqlite3.pc.in |
| michael@428 | 64 | --- sqlite3.pc.in.orig 2009-05-05 05:39:51 +0200 |
| michael@428 | 65 | +++ sqlite3.pc.in 2009-08-12 20:12:13 +0200 |
| michael@428 | 66 | @@ -8,6 +8,5 @@ |
| michael@428 | 67 | Name: SQLite |
| michael@428 | 68 | Description: SQL database engine |
| michael@428 | 69 | Version: @RELEASE@ |
| michael@428 | 70 | -Libs: -L${libdir} -lsqlite3 |
| michael@428 | 71 | -Libs.private: @LIBS@ |
| michael@428 | 72 | +Libs: -L${libdir} -lsqlite3 @LIBS@ |
| michael@428 | 73 | Cflags: -I${includedir} |
