From 3c635ab244b48708901e5763fb6c3345b9ce5190 Mon Sep 17 00:00:00 2001
From: quickdev <niklas.coding@gmail.com>
Date: Sat, 24 Jan 2009 17:13:32 +0100
Subject: 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.
---
 packages/python/python-mysqldb/mysqlpath.patch | 19 +++++++++++++++++++
 packages/python/python-mysqldb/site.patch      | 22 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 packages/python/python-mysqldb/mysqlpath.patch
 create mode 100644 packages/python/python-mysqldb/site.patch

(limited to 'packages/python/python-mysqldb')

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:
++
-- 
cgit v1.2.3