diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2012-04-05 23:54:23 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-26 10:05:16 +0100 |
commit | 3d8284487d354717f747efd188cd0b6b211f4bd1 (patch) | |
tree | 363eb356aeeb332b368dc79449cd283938a951b8 /meta/recipes-devtools | |
parent | 1174fa7f0c0b1414ac7dbc9d8c43de00c1acbae6 (diff) | |
download | poky-3d8284487d354717f747efd188cd0b6b211f4bd1.tar.gz |
python: Add patch to avoid warning about bsddb module
_bsddb module can be built only with db version between 4.1 and 4.7.
Avoid a warning by not adding this module to missing variable.
[YOCTO #1937]
(From OE-Core rev: d974ad03c58d7a221ebe3d59c57607928fbbd435)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python/avoid_warning_about_bsddb.patch | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python_2.7.2.bb | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python/avoid_warning_about_bsddb.patch b/meta/recipes-devtools/python/python/avoid_warning_about_bsddb.patch new file mode 100644 index 0000000000..4968744cb6 --- /dev/null +++ b/meta/recipes-devtools/python/python/avoid_warning_about_bsddb.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | _bsddb module can be built only with db version between 4.1 and 4.7. | ||
2 | Avoid a warning by not adding this module to missing variable. | ||
3 | |||
4 | Upstream-Status: Inappropriate [distribution] | ||
5 | |||
6 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
7 | |||
8 | |||
9 | Index: Python-2.7.2/setup.py | ||
10 | =================================================================== | ||
11 | --- Python-2.7.2.orig/setup.py 2012-04-05 23:16:49.268139840 +0300 | ||
12 | +++ Python-2.7.2/setup.py 2012-04-05 23:17:30.912138622 +0300 | ||
13 | @@ -1024,7 +1024,9 @@ | ||
14 | db_incs = None | ||
15 | dblibs = [] | ||
16 | dblib_dir = None | ||
17 | - missing.append('_bsddb') | ||
18 | + # We need db version between 4.1 and 4.7 | ||
19 | + # Avoid this warning | ||
20 | + #missing.append('_bsddb') | ||
21 | |||
22 | # The sqlite interface | ||
23 | sqlite_setup_debug = False # verbose debug prints from this script? | ||
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb index d25b882d95..9c53fc6cde 100644 --- a/meta/recipes-devtools/python/python_2.7.2.bb +++ b/meta/recipes-devtools/python/python_2.7.2.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require python.inc | 1 | require python.inc |
2 | DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" | 2 | DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" |
3 | PR = "${INC_PR}.17" | 3 | PR = "${INC_PR}.18" |
4 | 4 | ||
5 | DISTRO_SRC_URI ?= "file://sitecustomize.py" | 5 | DISTRO_SRC_URI ?= "file://sitecustomize.py" |
6 | DISTRO_SRC_URI_linuxstdbase = "" | 6 | DISTRO_SRC_URI_linuxstdbase = "" |
@@ -24,6 +24,7 @@ SRC_URI += "\ | |||
24 | file://setuptweaks.patch \ | 24 | file://setuptweaks.patch \ |
25 | file://check-if-target-is-64b-not-host.patch \ | 25 | file://check-if-target-is-64b-not-host.patch \ |
26 | file://search_db_h_in_inc_dirs_and_avoid_warning.patch \ | 26 | file://search_db_h_in_inc_dirs_and_avoid_warning.patch \ |
27 | file://avoid_warning_about_bsddb.patch \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | S = "${WORKDIR}/Python-${PV}" | 30 | S = "${WORKDIR}/Python-${PV}" |