From 897d07c313104ddb54fcf9c538acb0ca65e1a687 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 28 Dec 2014 21:54:55 +0100 Subject: python: rename patches to the new convention Note that we don't use completely sequential numbers, because patches below 100 are used to address cross-compilation issues in Python, while patches above 100 are used to make more Python modules configurable. [Thomas: fixup commit log.] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" --- .../python-015-fix-sqlite-without-threads.patch | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 package/python/python-015-fix-sqlite-without-threads.patch (limited to 'package/python/python-015-fix-sqlite-without-threads.patch') diff --git a/package/python/python-015-fix-sqlite-without-threads.patch b/package/python/python-015-fix-sqlite-without-threads.patch deleted file mode 100644 index f51c37b372..0000000000 --- a/package/python/python-015-fix-sqlite-without-threads.patch +++ /dev/null @@ -1,49 +0,0 @@ -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" - -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) -- cgit v1.2.3