From 9a98e0d1635c3a19767a9a62f2c807e2d549c1e5 Mon Sep 17 00:00:00 2001 From: Marcus Comstedt Date: Sat, 26 Apr 2014 15:32:34 +0200 Subject: [PATCH] sigrok-cross-android: Enable zlib module in Python --- cross-compile/android/Python-3.3.3.patch | 9 +++++++++ cross-compile/android/sigrok-cross-android | 1 + 2 files changed, 10 insertions(+) diff --git a/cross-compile/android/Python-3.3.3.patch b/cross-compile/android/Python-3.3.3.patch index 476889c..70cb735 100644 --- a/cross-compile/android/Python-3.3.3.patch +++ b/cross-compile/android/Python-3.3.3.patch @@ -209,3 +209,12 @@ index 832df53..c43e5e9 100644 except ImportError: +--- a/Misc/python.pc.in 2014-04-26 23:16:09.108514880 +0200 ++++ b/Misc/python.pc.in 2014-04-26 23:24:48.845467012 +0200 +@@ -9,5 +9,5 @@ + Requires: + Version: @VERSION@ + Libs.private: @LIBS@ +-Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ ++Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ -lz + Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android index c31cb97..84a303a 100755 --- a/cross-compile/android/sigrok-cross-android +++ b/cross-compile/android/sigrok-cross-android @@ -123,6 +123,7 @@ make distclean autoreconf patch -p1 < ../../Python-$VER_PYTHON.patch ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fdatasync=no ac_cv_func_killpg=no ac_cv_func_waitid=no ac_cv_func_sigaltstack=no ./configure $C --build=x86_64-linux-gnu --disable-ipv6 +sed -i "s/^#zlib/zlib/g" Modules/Setup make HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen install $PARALLEL cd .. -- 2.30.2