🌐 AI搜索 & 代理 主页
Skip to content

bpo-45774: Autoconfiscate SQLite detection (GH-29507) #29507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiran merged 18 commits into from
Nov 19, 2021
Merged

bpo-45774: Autoconfiscate SQLite detection (GH-29507) #29507

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f34b482
bpo-45774: Autoconfiscate SQLite detection
Nov 9, 2021
8d55894
Add NEWS
Nov 9, 2021
9bc5d7b
Don't pollute pyconfig.h with unneeded HAVE_SQLITE_H
Nov 9, 2021
7cd7b75
Merge branch 'main' into ac-sqlite
Nov 15, 2021
1a33d5c
Prelim pkg-config support
Nov 10, 2021
e90164d
Address review
Nov 17, 2021
02ed824
Make sure we append with leading whitespace. Set -lsqlite3 if pkg-con…
Nov 17, 2021
d083420
Merge branch 'main' into ac-sqlite
Nov 18, 2021
5e851ae
Use pkg-config ac macros
Nov 18, 2021
7cc1bcc
Module/Setup flags are added automatically
Nov 18, 2021
f3c920b
Revert spurious change
Nov 18, 2021
1cac681
Adjust NEWS wording
Nov 18, 2021
6f93aea
Merge branch 'main' into ac-sqlite
Nov 18, 2021
338f4d0
Move sqlite3 from Modules/Setup to Modules/Setup.stdlib.in
Nov 18, 2021
b8fb844
Address review: don't abort on failure to enable loadable SQLite exte…
Nov 18, 2021
d7c4180
Regenerate configure
Nov 18, 2021
41a78b5
Address macOS (arm) and FreeBSD buildbot issues
Nov 19, 2021
0173b66
We need to save/restore CFLAGS and LIBS
Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address macOS (arm) and FreeBSD buildbot issues
  • Loading branch information
Erlend E. Aasland committed Nov 19, 2021
commit 41a78b5b36d9c82ba6ce3bd00688bba32be55ba4
8 changes: 4 additions & 4 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11021,10 +11021,10 @@ $as_echo "yes" >&6; }
fi
as_fn_append LIBSQLITE3_CFLAGS ' -I$(srcdir)/Modules/_sqlite'

save_CFLAGS=$CFLAGS
save_CPPFLAGS=$CPPFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS=$LIBSQLITE3_CFLAGS
LDFLAGS=$LIBSQLITE3_LIBS
CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS"
LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"

ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
if test "x$ac_cv_header_sqlite3_h" = xyes; then :
Expand Down Expand Up @@ -11147,7 +11147,7 @@ fi



CFLAGS=$save_CFLAGS
CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS

# Check for support for loadable sqlite extensions
Expand Down
10 changes: 6 additions & 4 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3174,10 +3174,12 @@ PKG_CHECK_MODULES(
)
AS_VAR_APPEND([LIBSQLITE3_CFLAGS], [' -I$(srcdir)/Modules/_sqlite'])

AS_VAR_COPY([save_CFLAGS], [CFLAGS])
dnl bpo-45774/GH-29507: The CPP check in AC_CHECK_HEADER can fail on FreeBSD,
dnl hence CPPFLAGS instead of CFLAGS.
AS_VAR_COPY([save_CPPFLAGS], [CPPFLAGS])
AS_VAR_COPY([save_LDFLAGS], [LDFLAGS])
AS_VAR_COPY([CFLAGS], [LIBSQLITE3_CFLAGS])
AS_VAR_COPY([LDFLAGS], [LIBSQLITE3_LIBS])
CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS"
LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"

AC_CHECK_HEADER([sqlite3.h], [
AC_CHECK_LIB([sqlite3], [sqlite3_open_v2], [
Expand All @@ -3194,7 +3196,7 @@ AC_CHECK_HEADER([sqlite3.h], [
AC_CHECK_LIB([sqlite3], [sqlite3_load_extension])
])

AS_VAR_COPY([CFLAGS], [save_CFLAGS])
AS_VAR_COPY([CPPFLAGS], [save_CPPFLAGS])
AS_VAR_COPY([LDFLAGS], [save_LDFLAGS])

# Check for support for loadable sqlite extensions
Expand Down