python-mysqldb: Modified patch to properly compile. Removed it from nonworking.

Before, bitbake failed with "CROSS COMPILE Badness: /usr/include in INCLUDEPATH: /usr/include/mysql". The patch modification adds a new line in
site.cfg, which removes /usr/include/mysql from INCLUDEPATH.

3 files changed, 61 insertions, 0 deletions

diff --git a/packages/python/python-mysqldb/mysqlpath.patch b/packages/python/python-mysqldb/mysqlpath.patch
new file mode 100644
index 0000000000..3f471a1703
--- /dev/null
+++ b/packages/python/python-mysqldb/mysqlpath.patch
@@ -0,0 +1,19 @@
+Index: MySQL-python-1.2.1_p2/_mysql.c
+===================================================================
+--- MySQL-python-1.2.1_p2.orig/_mysql.c	2006-05-31 12:07:36.000000000 +0200
++++ MySQL-python-1.2.1_p2/_mysql.c	2006-05-31 12:08:25.000000000 +0200
+@@ -36,10 +36,10 @@
+ #endif
+ 
+ #include "structmember.h"
+-#include "mysql.h"
+-#include "my_config.h"
+-#include "mysqld_error.h"
+-#include "errmsg.h"
++#include "mysql/mysql.h"
++#include "mysql/my_config.h"
++#include "mysql/mysqld_error.h"
++#include "mysql/errmsg.h"
+ 
+ #if PY_VERSION_HEX < 0x02020000
+ # define MyTuple_Resize(t,n,d) _PyTuple_Resize(t, n, d)
diff --git a/packages/python/python-mysqldb/site.patch b/packages/python/python-mysqldb/site.patch
new file mode 100644
index 0000000000..c2d1346767
--- /dev/null
+++ b/packages/python/python-mysqldb/site.patch
@@ -0,0 +1,22 @@
+Index: MySQL-python-1.2.1_p2/site.cfg
+===================================================================
+--- MySQL-python-1.2.1_p2.orig/site.cfg	2009-01-24 16:36:21.000000000 +0100
++++ MySQL-python-1.2.1_p2/site.cfg	2009-01-24 16:37:07.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ [options]
+ embedded = False
+-threadsafe = True
++threadsafe = False
+ static = False
+ 
+ # Use the compiler section to add additional options for the extension build.
+@@ -26,3 +26,8 @@
+ # advapi32
+ #extra_compile_args:
+ #extra_objects:
++
++# Without the following line, bitbake would fail with:
++# CROSS COMPILE Badness: /usr/include in INCLUDEPATH: /usr/include/mysql
++include_dirs:
++
diff --git a/packages/python/python-mysqldb_1.2.1.bb b/packages/python/python-mysqldb_1.2.1.bb
new file mode 100644
index 0000000000..9a9ca0fe56
--- /dev/null
+++ b/packages/python/python-mysqldb_1.2.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Python interface to MySQL"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "mysql"
+SRCNAME = "MySQL-python"
+
+inherit distutils
+
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/mysql-python/MySQL-python-${PV}_p2.tar.gz \
+  file://mysqlpath.patch;patch=1 \
+  file://site.patch;patch=1 \
+"
+S = "${WORKDIR}/${SRCNAME}-${PV}_p2"
+
+do_install_append() {
+    install -d ${D}${datadir}/doc/${PN}/
+    install -m 0644 ${S}/doc/*.txt ${D}${datadir}/doc/${PN}/
+}