mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-01 13:49:03 +03:00
9badea2d05
In addition to doing the bump, this commit also: - Refreshes all the patches - Removes python-003-properly-detect-if-python-build.patch, which has been applied upstream. - Passes the --without-ensurepip option, like is done in Python 3, to avoid having Python use PIP to automatically download stuff when it is being built. - PYTHON_LIBTOOL_PATH = NO is added to prevent Buildroot from trying to patch a version of libtool for which we don't have matching patches, which isn't a problem since we're anyway not using the part of the Python sources that uses libtool (it's the built-in copy of libffi, and we use the external libffi). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
50 lines
1.3 KiB
Diff
50 lines
1.3 KiB
Diff
sqlite3: fix build when threads are not used/available
|
|
|
|
When threads are not used/available, a function in the sqlite3 extension
|
|
ends up with a label at the end:
|
|
|
|
void _pysqlite_final_callback(sqlite3_context* context)
|
|
{
|
|
PyObject* function_result;
|
|
PyObject** aggregate_instance;
|
|
int ok;
|
|
|
|
#ifdef WITH_THREAD
|
|
PyGILState_STATE threadstate;
|
|
|
|
threadstate = PyGILState_Ensure();
|
|
#endif
|
|
|
|
aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
|
|
if (!*aggregate_instance) {
|
|
goto error;
|
|
}
|
|
|
|
[......]
|
|
|
|
error:
|
|
#ifdef WITH_THREAD
|
|
PyGILState_Release(threadstate);
|
|
#endif
|
|
}
|
|
|
|
This is not valid, and gcc complains.
|
|
|
|
Fix that by adding a dummy statement after the label, so that the label
|
|
is never the last statement of the function.
|
|
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
|
|
Index: b/Modules/_sqlite/connection.c
|
|
===================================================================
|
|
--- a/Modules/_sqlite/connection.c
|
|
+++ b/Modules/_sqlite/connection.c
|
|
@@ -786,6 +786,7 @@
|
|
#ifdef WITH_THREAD
|
|
PyGILState_Release(threadstate);
|
|
#endif
|
|
+ ; /* Make gcc happy: a label can't be at the end of a function */
|
|
}
|
|
|
|
static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
|