diff options
| author | Roland Hieber <rhi@pengutronix.de> | 2019-07-15 12:57:26 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-07-16 13:35:17 +0200 |
| commit | f6cafe10925ce4441a62198d582d3bca2d4a3262 (patch) | |
| tree | 4321d03643431806fe6a1ef8def4a791e255e70b /patches | |
| parent | 3babd044d7d6ed274b324403dc1e3484ff62a742 (diff) | |
| download | ptxdist-f6cafe10925ce4441a62198d582d3bca2d4a3262.tar.gz ptxdist-f6cafe10925ce4441a62198d582d3bca2d4a3262.tar.xz | |
sqlite: version bump 3.19.2 -> 3.28.0
Clean up and pin down the config options. The removed defines in
CPPFLAGS are already set by the configure script when we supply the
right configure options; and this way ./scripts/configure_helper.py is
also happy. Add a patch so that building without pthreads does not fail
with linker errors (could already be broken in previous versions, but I
didn't test).
Even if "public_domain" is not a valid SPDX license identifier (see this
discussion [1] for background), it describes the license situation best.
Pin down the license MD5 mentioning that it is public domain.
[1]: https://wiki.spdx.org/view/Legal_Team/Decisions/Dealing_with_Public_Domain_within_SPDX_Files
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch | 29 | ||||
| l--------- | patches/sqlite-autoconf-3280000/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/sqlite-autoconf-3280000/series | 4 |
3 files changed, 34 insertions, 0 deletions
diff --git a/patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch b/patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch new file mode 100644 index 000000000..1e3a641a7 --- /dev/null +++ b/patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch @@ -0,0 +1,29 @@ +From: Roland Hieber <rhi@pengutronix.de> +Date: Tue, 9 Jul 2019 12:18:52 +0200 +Subject: [PATCH] configure: make --disable-threadsafe work + +SQLITE_THREADSAFE can be 0, 1 or 2, and if it is not defined, it +is defined to 1 by default in sqlite3.c. + +_REENTRANT only needs to be defined or undefined according to +https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html#Feature-Test-Macros + +Forwarded: https://www.mail-archive.com/sqlite-users@mailinglists.sqlite.org/msg115812.html +Signed-off-by: Roland Hieber <rhi@pengutronix.de> +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index f0b70b96428c..3044077e93f6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -91,6 +91,8 @@ if test x"$enable_threadsafe" != "xno"; then + BUILD_CFLAGS="$BUILD_CFLAGS -D_REENTRANT=1 -DSQLITE_THREADSAFE=1" + AC_SEARCH_LIBS(pthread_create, pthread) + AC_SEARCH_LIBS(pthread_mutexattr_init, pthread) ++else ++ BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_THREADSAFE=0" + fi + #----------------------------------------------------------------------- + diff --git a/patches/sqlite-autoconf-3280000/autogen.sh b/patches/sqlite-autoconf-3280000/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/sqlite-autoconf-3280000/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/sqlite-autoconf-3280000/series b/patches/sqlite-autoconf-3280000/series new file mode 100644 index 000000000..516ce59bd --- /dev/null +++ b/patches/sqlite-autoconf-3280000/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-configure-make-disable-threadsafe-work.patch +# 7c01923b9908ba74dacfdb9f965dc010 - git-ptx-patches magic |