Fossil

Check-in [a481a8176b]
Login

Check-in [a481a8176b]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Since fossil now uses sqlite_malloc64, which is introduced in SQLite 3.8.7, don't accept linkage using earlier SQLite versions any more.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a481a8176b9fa8ab9cdd71c45d8d5fa6109c2b45
User & Date: jan.nijtmans 2015-05-04 20:10:14.980
Context
2015-05-05
06:49
Now really update the built-in SQLite to the first 3.8.10 beta, not only the command line shell. ... (check-in: acd670f251 user: jan.nijtmans tags: trunk)
2015-05-04
21:10
merge trunk ... (check-in: 857ab8ae1d user: jan.nijtmans tags: cleanX)
20:10
Since fossil now uses sqlite_malloc64, which is introduced in SQLite 3.8.7, don't accept linkage using earlier SQLite versions any more. ... (check-in: a481a8176b user: jan.nijtmans tags: trunk)
19:25
Update the built-in SQLite to the first 3.8.10 beta. ... (check-in: 5a87a0314e user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to auto.def.
︙︙
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64


      # Locate the system SQLite by searching for sqlite3_open(). Then check
      # if sqlite3_strglob() can be found as well. If we can find open() but
      # not strglob(), then the system SQLite is too old to link against
      # fossil.
      #
      if {[cc-check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
        if {![cc-check-function-in-lib sqlite3_strglob sqlite3 $extralibs]} {
          user-error "system sqlite3 too old (require >= 3.7.17)"
        }

        # Success. Update symbols and return.
        #
        define USE_SYSTEM_SQLITE 1
        define-append LIBS $extralibs
        return








|
|








49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64


      # Locate the system SQLite by searching for sqlite3_open(). Then check
      # if sqlite3_strglob() can be found as well. If we can find open() but
      # not strglob(), then the system SQLite is too old to link against
      # fossil.
      #
      if {[cc-check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
        if {![cc-check-function-in-lib sqlite3_malloc64 sqlite3 $extralibs]} {
          user-error "system sqlite3 too old (require >= 3.8.7)"
        }

        # Success. Update symbols and return.
        #
        define USE_SYSTEM_SQLITE 1
        define-append LIBS $extralibs
        return
︙︙
Changes to src/main.c.
︙︙
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603

#endif
int main(int argc, char **argv)
#endif
{
  const char *zCmdName = "unknown";
  int idx;
  int rc;
  if( sqlite3_libversion_number()<3008003 ){
    fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.3",
                 sqlite3_libversion());
  }
  sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
  sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
  memset(&g, 0, sizeof(g));
  g.now = time(0);
  g.httpHeader = empty_blob;








|
|








588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603

#endif
int main(int argc, char **argv)
#endif
{
  const char *zCmdName = "unknown";
  int idx;
  int rc;
  if( sqlite3_libversion_number()<3008007 ){
    fossil_fatal("Unsuitable SQLite version %s, must be at least 3.8.7",
                 sqlite3_libversion());
  }
  sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
  sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0);
  memset(&g, 0, sizeof(g));
  g.now = time(0);
  g.httpHeader = empty_blob;
︙︙