diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-08-27 12:36:28 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-08-27 15:49:22 +0200 |
commit | edf766e10640997dcba60066ff63875f7f5e9e47 (patch) | |
tree | a82aafebd3b1e64637ba693e8a1d402444b48be6 | |
parent | 6761cd7e871dc5a741f19e9909f072afb8204626 (diff) | |
download | ptxdist-edf766e10640997dcba60066ff63875f7f5e9e47.tar.gz ptxdist-edf766e10640997dcba60066ff63875f7f5e9e47.tar.xz |
python: add patch to fix building without openssl
without this patch we get no sha256/sha512 implementation, which is needed
for various distutils stuff (e.g. to build 'flup')
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
18 files changed, 43 insertions, 18 deletions
diff --git a/patches/Python-2.6.6/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch b/patches/Python-2.6.6/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch index b8a535b14..1d3575147 100644 --- a/patches/Python-2.6.6/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch +++ b/patches/Python-2.6.6/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch @@ -8,11 +8,11 @@ necessary code to use the python socket module for socketcan. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- - Lib/plat-linux2/IN.py | 2 + + Lib/plat-linux2/IN.py | 2 ++ Modules/socketmodule.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ Modules/socketmodule.h | 11 ++++++ configure.in | 13 +++++++ - 4 files changed, 115 insertions(+), 0 deletions(-) + 4 files changed, 115 insertions(+) diff --git a/Lib/plat-linux2/IN.py b/Lib/plat-linux2/IN.py index ad307f6..f72ae88 100644 diff --git a/patches/Python-2.6.6/0002-printf-format-zd.patch b/patches/Python-2.6.6/0002-printf-format-zd.patch index 6260e39b7..10196deae 100644 --- a/patches/Python-2.6.6/0002-printf-format-zd.patch +++ b/patches/Python-2.6.6/0002-printf-format-zd.patch @@ -5,7 +5,7 @@ Subject: [PATCH] printf format %zd Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- configure.in | 23 +++++++++++++++++++---- - 1 files changed, 19 insertions(+), 4 deletions(-) + 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index e9b5cf0..87fad98 100644 diff --git a/patches/Python-2.6.6/0003-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch b/patches/Python-2.6.6/0003-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch index 297dcb3c3..c306d9231 100644 --- a/patches/Python-2.6.6/0003-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch +++ b/patches/Python-2.6.6/0003-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch @@ -19,7 +19,7 @@ This patch uses AC_COMPILE_IFELSE for these tests: Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- configure.in | 12 ++++-------- - 1 files changed, 4 insertions(+), 8 deletions(-) + 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index 87fad98..8d130b4 100644 diff --git a/patches/Python-2.6.6/0004-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch b/patches/Python-2.6.6/0004-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch index 9ffef38ea..ea451c967 100644 --- a/patches/Python-2.6.6/0004-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch +++ b/patches/Python-2.6.6/0004-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch @@ -9,7 +9,7 @@ its size. Use it, rather than hand crafted function with AC_TRY_COMPILE. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- configure.in | 12 +++--------- - 1 files changed, 3 insertions(+), 9 deletions(-) + 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index 8d130b4..c85e89b 100644 diff --git a/patches/Python-2.6.6/0005-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch b/patches/Python-2.6.6/0005-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch index 0b171dabe..23d41b4a7 100644 --- a/patches/Python-2.6.6/0005-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch +++ b/patches/Python-2.6.6/0005-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch @@ -8,7 +8,7 @@ test to detect long double support. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- configure.in | 12 ++---------- - 1 files changed, 2 insertions(+), 10 deletions(-) + 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index c85e89b..cb09bf7 100644 diff --git a/patches/Python-2.6.6/0006-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch b/patches/Python-2.6.6/0006-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch index 0b14f368b..4914be9b9 100644 --- a/patches/Python-2.6.6/0006-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch +++ b/patches/Python-2.6.6/0006-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch @@ -14,7 +14,7 @@ This patch converts the following tests to AC_CHECK_SIZEOF: Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- configure.in | 58 ++++------------------------------------------------------ - 1 files changed, 4 insertions(+), 54 deletions(-) + 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/configure.in b/configure.in index cb09bf7..1066880 100644 diff --git a/patches/Python-2.6.6/0007-fix-silent-flag.patch b/patches/Python-2.6.6/0007-fix-silent-flag.patch index 9fbc58de8..fa3079b8b 100644 --- a/patches/Python-2.6.6/0007-fix-silent-flag.patch +++ b/patches/Python-2.6.6/0007-fix-silent-flag.patch @@ -9,7 +9,7 @@ is detected in $MAKEFLAGS, "*s*" is not sufficient. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- Makefile.pre.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 0329d67..f8a8d36 100644 diff --git a/patches/Python-2.6.6/0008-upstream-patch-to-fix-parallel-building.patch b/patches/Python-2.6.6/0008-upstream-patch-to-fix-parallel-building.patch index 43e3c9412..660430065 100644 --- a/patches/Python-2.6.6/0008-upstream-patch-to-fix-parallel-building.patch +++ b/patches/Python-2.6.6/0008-upstream-patch-to-fix-parallel-building.patch @@ -26,7 +26,7 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- Makefile.pre.in | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) + 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index f8a8d36..8b1e44b 100644 diff --git a/patches/Python-2.6.6/0009-use-PGEN_FOR_BUILD.patch b/patches/Python-2.6.6/0009-use-PGEN_FOR_BUILD.patch index 77616ba67..941b17ff1 100644 --- a/patches/Python-2.6.6/0009-use-PGEN_FOR_BUILD.patch +++ b/patches/Python-2.6.6/0009-use-PGEN_FOR_BUILD.patch @@ -5,7 +5,7 @@ Subject: [PATCH] use PGEN_FOR_BUILD Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- Makefile.pre.in | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 8b1e44b..703c6aa 100644 diff --git a/patches/Python-2.6.6/0011-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch b/patches/Python-2.6.6/0011-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch index dbb5e4126..14c11cd53 100644 --- a/patches/Python-2.6.6/0011-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch +++ b/patches/Python-2.6.6/0011-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch @@ -12,7 +12,7 @@ scenario. (see later patch) Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- Lib/distutils/sysconfig.py | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index 350e48c..83af687 100644 diff --git a/patches/Python-2.6.6/0012-setup.py-don-t-leak-host-path-into-cross-compilation.patch b/patches/Python-2.6.6/0012-setup.py-don-t-leak-host-path-into-cross-compilation.patch index 3e53cc26b..afd4b4119 100644 --- a/patches/Python-2.6.6/0012-setup.py-don-t-leak-host-path-into-cross-compilation.patch +++ b/patches/Python-2.6.6/0012-setup.py-don-t-leak-host-path-into-cross-compilation.patch @@ -9,7 +9,7 @@ search patch) to leak into our environment. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- setup.py | 36 +++++++++++++++++++++++++++++------- - 1 files changed, 29 insertions(+), 7 deletions(-) + 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 6e02114..08208bd 100644 diff --git a/patches/Python-2.6.6/0013-setup.py-skip-import-check-while-cross-compiling.patch b/patches/Python-2.6.6/0013-setup.py-skip-import-check-while-cross-compiling.patch index 93360c16f..480f68869 100644 --- a/patches/Python-2.6.6/0013-setup.py-skip-import-check-while-cross-compiling.patch +++ b/patches/Python-2.6.6/0013-setup.py-skip-import-check-while-cross-compiling.patch @@ -8,7 +8,7 @@ compiled modules into the build python. This patch skips this check. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- setup.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index 08208bd..01b0ffc 100644 diff --git a/patches/Python-2.6.6/0015-provide-wrapper-for-cross-python.patch b/patches/Python-2.6.6/0015-provide-wrapper-for-cross-python.patch index f1deeff00..31e59f6d8 100644 --- a/patches/Python-2.6.6/0015-provide-wrapper-for-cross-python.patch +++ b/patches/Python-2.6.6/0015-provide-wrapper-for-cross-python.patch @@ -9,7 +9,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- configure.in | 2 +- cross-python-wrapper.in | 13 +++++++++++++ - 2 files changed, 14 insertions(+), 1 deletions(-) + 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 cross-python-wrapper.in diff --git a/configure.in b/configure.in diff --git a/patches/Python-2.6.6/0016-python-fix-long-long-autoconf-test.patch b/patches/Python-2.6.6/0016-python-fix-long-long-autoconf-test.patch index 63b7ec5ed..ac133bd42 100644 --- a/patches/Python-2.6.6/0016-python-fix-long-long-autoconf-test.patch +++ b/patches/Python-2.6.6/0016-python-fix-long-long-autoconf-test.patch @@ -7,7 +7,7 @@ New autoconf versions have AC_TYPE_LONG_LONG_INT, use it. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- configure.in | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 9b80a5d..2895a7d 100644 diff --git a/patches/Python-2.6.6/0017-python-don-t-add-rpaths-in-setup.py.patch b/patches/Python-2.6.6/0017-python-don-t-add-rpaths-in-setup.py.patch index 1528f9c6b..878786007 100644 --- a/patches/Python-2.6.6/0017-python-don-t-add-rpaths-in-setup.py.patch +++ b/patches/Python-2.6.6/0017-python-don-t-add-rpaths-in-setup.py.patch @@ -7,7 +7,7 @@ We don't add rpaths. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- setup.py | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index d3aac1b..8c86ed8 100644 diff --git a/patches/Python-2.6.6/0018-assume-non-buggy-getaddrinfo-when-cross-compiling.patch b/patches/Python-2.6.6/0018-assume-non-buggy-getaddrinfo-when-cross-compiling.patch index 3009c7ade..cd25de424 100644 --- a/patches/Python-2.6.6/0018-assume-non-buggy-getaddrinfo-when-cross-compiling.patch +++ b/patches/Python-2.6.6/0018-assume-non-buggy-getaddrinfo-when-cross-compiling.patch @@ -5,7 +5,7 @@ Subject: [PATCH] assume non-buggy getaddrinfo when cross-compiling Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- configure.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 2895a7d..9de0dcc 100644 diff --git a/patches/Python-2.6.6/0019-also-build-_sha256-_sha512-if-openssl-is-not-found.patch b/patches/Python-2.6.6/0019-also-build-_sha256-_sha512-if-openssl-is-not-found.patch new file mode 100644 index 000000000..831129125 --- /dev/null +++ b/patches/Python-2.6.6/0019-also-build-_sha256-_sha512-if-openssl-is-not-found.patch @@ -0,0 +1,24 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Mon, 27 Aug 2012 12:29:15 +0200 +Subject: [PATCH] also build _sha256/_sha512 if openssl is not found + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + setup.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 8c86ed8..fc6cd8a 100644 +--- a/setup.py ++++ b/setup.py +@@ -779,7 +779,9 @@ class PyBuildExt(build_ext): + depends = ['md5.h']) ) + missing.append('_hashlib') + +- if (openssl_ver < 0x00908000): ++ if (ssl_incs is None or ++ ssl_libs is None or ++ openssl_ver < 0x00908000): + # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash + exts.append( Extension('_sha256', ['sha256module.c']) ) + exts.append( Extension('_sha512', ['sha512module.c']) ) diff --git a/patches/Python-2.6.6/series b/patches/Python-2.6.6/series index c84030fbc..3b9537002 100644 --- a/patches/Python-2.6.6/series +++ b/patches/Python-2.6.6/series @@ -18,4 +18,5 @@ 0016-python-fix-long-long-autoconf-test.patch 0017-python-don-t-add-rpaths-in-setup.py.patch 0018-assume-non-buggy-getaddrinfo-when-cross-compiling.patch -# e4b2d0366f87ef051c7b5151c479533e - git-ptx-patches magic +0019-also-build-_sha256-_sha512-if-openssl-is-not-found.patch +# 31950c9abe57324bafb77406b67f36fb - git-ptx-patches magic |