diff options
| author |   Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-24 19:25:27 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-24 19:25:27 +0100 |
| commit | 181a7c81402a35d1193703a7e37fd2b646bdbc51 (patch) | |
| tree | 82fc6c164e8217e22f25d186d9c8664216bf1463 | |
| parent | 70418c7c0899c17dccf3df7fdf96fb219b0ad163 (diff) | |
| parent | 1164a7c9816c8275e8cf16e8659c1ccb47c51373 (diff) | |
| download | openembedded-181a7c81402a35d1193703a7e37fd2b646bdbc51.tar.gz | |
Merge branch 'fso/milestone5' of git@git.openembedded.net:openembedded into fso/milestone5
| -rw-r--r-- | packages/nonworking/python/python-mysqldb/site.patch | 13 | ||||
| -rw-r--r-- | packages/python/python-mysqldb/mysqlpath.patch (renamed from packages/nonworking/python/python-mysqldb/mysqlpath.patch) | 0 | ||||
| -rw-r--r-- | packages/python/python-mysqldb/site.patch | 22 | ||||
| -rw-r--r-- | packages/python/python-mysqldb_1.2.1.bb (renamed from packages/nonworking/python/python-mysqldb_1.2.1.bb) | 0 |
4 files changed, 22 insertions, 13 deletions
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 index 3f471a1703..3f471a1703 100644 --- a/packages/nonworking/python/python-mysqldb/mysqlpath.patch +++ b/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 index 9a9ca0fe56..9a9ca0fe56 100644 --- a/packages/nonworking/python/python-mysqldb_1.2.1.bb +++ b/packages/python/python-mysqldb_1.2.1.bb |