diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-06-02 12:25:40 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 13:13:26 +0100 |
commit | f5d36b1c5640f4d2975ba110fdb8a918b17ecbcd (patch) | |
tree | 4787388510304515aab3db15bce7d14885288696 /meta/recipes-devtools | |
parent | 141fa73f97d72e074f7c1a3ce1efe1cd84f07b78 (diff) | |
download | poky-f5d36b1c5640f4d2975ba110fdb8a918b17ecbcd.tar.gz |
python3: drop 110-enable-zlib.patch
With the patch, the zlib extension wasn't built at all.
Without the patch, it gets build just fine.
(From OE-Core rev: 59870a852cf88ecef094db0a2adec168a8997626)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/python3-native_3.5.1.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/110-enable-zlib.patch | 21 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.5.1.bb | 1 |
3 files changed, 0 insertions, 23 deletions
diff --git a/meta/recipes-devtools/python/python3-native_3.5.1.bb b/meta/recipes-devtools/python/python3-native_3.5.1.bb index e8d0f9b5ea..126935be52 100644 --- a/meta/recipes-devtools/python/python3-native_3.5.1.bb +++ b/meta/recipes-devtools/python/python3-native_3.5.1.bb | |||
@@ -12,7 +12,6 @@ file://020-dont-compile-python-files.patch \ | |||
12 | file://030-fixup-include-dirs.patch \ | 12 | file://030-fixup-include-dirs.patch \ |
13 | file://070-dont-clean-ipkg-install.patch \ | 13 | file://070-dont-clean-ipkg-install.patch \ |
14 | file://080-distutils-dont_adjust_files.patch \ | 14 | file://080-distutils-dont_adjust_files.patch \ |
15 | file://110-enable-zlib.patch \ | ||
16 | file://130-readline-setup.patch \ | 15 | file://130-readline-setup.patch \ |
17 | file://150-fix-setupterm.patch \ | 16 | file://150-fix-setupterm.patch \ |
18 | file://python-3.3-multilib.patch \ | 17 | file://python-3.3-multilib.patch \ |
diff --git a/meta/recipes-devtools/python/python3/110-enable-zlib.patch b/meta/recipes-devtools/python/python3/110-enable-zlib.patch deleted file mode 100644 index fb92a19163..0000000000 --- a/meta/recipes-devtools/python/python3/110-enable-zlib.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Enable zlib in python | ||
2 | |||
3 | -Khem | ||
4 | |||
5 | Upstream-Status: Inappropriate [OE-Specific] | ||
6 | |||
7 | --- | ||
8 | Modules/Setup.dist | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | --- a/Modules/Setup.dist | ||
12 | +++ b/Modules/Setup.dist | ||
13 | @@ -354,7 +354,7 @@ _symtable symtablemodule.c | ||
14 | # Andrew Kuchling's zlib module. | ||
15 | # This require zlib 1.1.3 (or later). | ||
16 | # See http://www.gzip.org/zlib/ | ||
17 | -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz | ||
18 | +zlib zlibmodule.c -lz | ||
19 | |||
20 | # Interface to the Expat XML parser | ||
21 | # | ||
diff --git a/meta/recipes-devtools/python/python3_3.5.1.bb b/meta/recipes-devtools/python/python3_3.5.1.bb index 62e7b65083..ebfdcdb749 100644 --- a/meta/recipes-devtools/python/python3_3.5.1.bb +++ b/meta/recipes-devtools/python/python3_3.5.1.bb | |||
@@ -13,7 +13,6 @@ file://020-dont-compile-python-files.patch \ | |||
13 | file://030-fixup-include-dirs.patch \ | 13 | file://030-fixup-include-dirs.patch \ |
14 | file://070-dont-clean-ipkg-install.patch \ | 14 | file://070-dont-clean-ipkg-install.patch \ |
15 | file://080-distutils-dont_adjust_files.patch \ | 15 | file://080-distutils-dont_adjust_files.patch \ |
16 | file://110-enable-zlib.patch \ | ||
17 | file://130-readline-setup.patch \ | 16 | file://130-readline-setup.patch \ |
18 | file://150-fix-setupterm.patch \ | 17 | file://150-fix-setupterm.patch \ |
19 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ | 18 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ |