From: quickdev <niklas.coding@gmail.com>
Date: Sat, 24 Jan 2009 16:13:32 +0000 (+0100)
Subject: python-mysqldb: Modified patch to properly compile. Removed it from nonworking.
X-Git-Tag: Release-2010-05/1~4133
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c635ab244b48708901e5763fb6c3345b9ce5190;p=openembedded.git

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.
---

diff --git a/packages/nonworking/python/python-mysqldb/site.patch b/packages/nonworking/python/python-mysqldb/site.patch
deleted file mode 100644
index c99ee3bc0d..0000000000
--- a/packages/nonworking/python/python-mysqldb/site.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: MySQL-python-1.2.1_p2/site.cfg
-===================================================================
---- MySQL-python-1.2.1_p2.orig/site.cfg	2006-05-31 12:13:45.000000000 +0200
-+++ MySQL-python-1.2.1_p2/site.cfg	2006-05-31 12:13:55.000000000 +0200
-@@ -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.
diff --git a/packages/nonworking/python/python-mysqldb/mysqlpath.patch b/packages/python/python-mysqldb/mysqlpath.patch
similarity index 100%
rename from packages/nonworking/python/python-mysqldb/mysqlpath.patch
rename to packages/python/python-mysqldb/mysqlpath.patch
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/nonworking/python/python-mysqldb_1.2.1.bb b/packages/python/python-mysqldb_1.2.1.bb
similarity index 100%
rename from packages/nonworking/python/python-mysqldb_1.2.1.bb
rename to packages/python/python-mysqldb_1.2.1.bb