From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH 8/9] sqlite: version bump 3.28 -> 3.35.5
Date: Sun, 16 May 2021 20:52:31 +0200 [thread overview]
Message-ID: <20210516185231.5680-8-rhi@pengutronix.de> (raw)
In-Reply-To: <20210516185231.5680-1-rhi@pengutronix.de>
Remove the remaining patch, the underlying problem was fixed upstream in
version 3.35.0, check-in e64ff2cce3c03ba2.
Link: https://www.sqlite.org/src/info/e64ff2cce3c03ba2
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
...nfigure-make-disable-threadsafe-work.patch | 29 -------------------
patches/sqlite-autoconf-3280000/autogen.sh | 1 -
patches/sqlite-autoconf-3280000/series | 4 ---
rules/host-sqlite.make | 1 +
rules/sqlite.make | 7 +++--
5 files changed, 5 insertions(+), 37 deletions(-)
delete mode 100644 patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch
delete mode 120000 patches/sqlite-autoconf-3280000/autogen.sh
delete mode 100644 patches/sqlite-autoconf-3280000/series
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
deleted file mode 100644
index 1e3a641a72b6..000000000000
--- a/patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 120000
index 9f8a4cb7ddcb..000000000000
--- a/patches/sqlite-autoconf-3280000/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/sqlite-autoconf-3280000/series b/patches/sqlite-autoconf-3280000/series
deleted file mode 100644
index 516ce59bdbad..000000000000
--- a/patches/sqlite-autoconf-3280000/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-configure-make-disable-threadsafe-work.patch
-# 7c01923b9908ba74dacfdb9f965dc010 - git-ptx-patches magic
diff --git a/rules/host-sqlite.make b/rules/host-sqlite.make
index 0a32adc0cf07..8fc54861b52c 100644
--- a/rules/host-sqlite.make
+++ b/rules/host-sqlite.make
@@ -41,6 +41,7 @@ HOST_SQLITE_CONF_OPT := \
--disable-readline \
--enable-threadsafe \
--disable-dynamic-extensions \
+ --disable-math \
--disable-fts5 \
--enable-json1 \
--disable-session \
diff --git a/rules/sqlite.make b/rules/sqlite.make
index 67a66a3718f1..eb866118accc 100644
--- a/rules/sqlite.make
+++ b/rules/sqlite.make
@@ -19,11 +19,11 @@ PACKAGES-$(PTXCONF_SQLITE) += sqlite
#
# Paths and names
#
-SQLITE_VERSION := 3280000
-SQLITE_MD5 := 3c68eb400f8354605736cd55400e1572
+SQLITE_VERSION := 3350500
+SQLITE_MD5 := d1d1aba394c8e0443077dc9f1a681bb8
SQLITE := sqlite-autoconf-$(SQLITE_VERSION)
SQLITE_SUFFIX := tar.gz
-SQLITE_URL := https://www.sqlite.org/2019/$(SQLITE).$(SQLITE_SUFFIX)
+SQLITE_URL := https://www.sqlite.org/2021/$(SQLITE).$(SQLITE_SUFFIX)
SQLITE_SOURCE := $(SRCDIR)/$(SQLITE).$(SQLITE_SUFFIX)
SQLITE_DIR := $(BUILDDIR)/$(SQLITE)
SQLITE_LICENSE := public_domain
@@ -58,6 +58,7 @@ SQLITE_CONF_OPT := \
--$(call ptx/endis,PTXCONF_SQLITE_READLINE)-readline \
--$(call ptx/endis,PTXCONF_SQLITE_THREADSAFE)-threadsafe \
--$(call ptx/endis,PTXCONF_SQLITE_LOAD_EXTENSION)-dynamic-extensions \
+ --disable-math \
--enable-fts4 \
--enable-fts3 \
--disable-fts5 \
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-05-16 18:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-16 18:52 [ptxdist] [PATCH 1/9] bzip2: add upstream URL, switch to HTTPS Roland Hieber
2021-05-16 18:52 ` [ptxdist] [PATCH 2/9] bzip2: add license files Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 3/9] bzip2: version bump 1.0.6 -> 1.0.8 Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 4/9] libarchive: move to HTTPS URL Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 5/9] libarchive: add license files Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 6/9] libarchive: version bump 3.3.2 -> 3.5.1 Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 7/9] unzip: version bump 5.52 -> 6.00 Roland Hieber
2021-05-21 9:35 ` Michael Olbrich
2021-05-24 18:36 ` Roland Hieber
2021-05-16 18:52 ` Roland Hieber [this message]
2021-05-27 6:45 ` [ptxdist] [APPLIED] sqlite: version bump 3.28 -> 3.35.5 Michael Olbrich
2021-05-16 18:52 ` [ptxdist] [PATCH 9/9] dhcp: move to HTTPS URL Roland Hieber
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-27 6:45 ` [ptxdist] [APPLIED] bzip2: add upstream URL, switch to HTTPS Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210516185231.5680-8-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox