commit 4e2f4a76e35a3bfe880abf6f425ef688a25aebc2
parent ee88853e04b3caa2bdbfd73a5d991baebf59df10
Author: Alexandru Ardelean <ardeleanalex@gmail.com>
Date: Wed, 11 Jan 2017 15:04:03 +0200
python: use built-in libffi lib for host build
Python comes with it's own builtin libffi lib, which
seems easier to use for the host build, than trying
to use the one from the package feeds.
Also, dropping `005-fix-libffi-x86-64-configure.patch`
Not needed anymore.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Diffstat:
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/lang/python/Makefile b/lang/python/Makefile
@@ -36,7 +36,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=python/host
-HOST_BUILD_DEPENDS:=bzip2/host expat/host libffi/host
+HOST_BUILD_DEPENDS:=bzip2/host expat/host
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
@@ -239,7 +239,7 @@ HOST_CONFIGURE_ARGS+= \
--prefix=$(HOST_PYTHON_DIR) \
--exec-prefix=$(HOST_PYTHON_DIR) \
--with-system-expat=$(STAGING_DIR_HOSTPKG) \
- --with-system-ffi \
+ --with-system-ffi=no \
CONFIG_SITE=
define Host/Install
diff --git a/lang/python/patches/005-fix-libffi-x86-64-configure.patch b/lang/python/patches/005-fix-libffi-x86-64-configure.patch
@@ -1,31 +0,0 @@
-diff --git a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
-index 75f62a7..4d6c9f2 100755
---- a/Modules/_ctypes/libffi/configure
-+++ b/Modules/_ctypes/libffi/configure
-@@ -17257,20 +17257,12 @@ case "$host" in
- fi
- ;;
-
-- i?86-*-* | x86_64-*-*)
-- TARGETDIR=x86
-- if test $ac_cv_sizeof_size_t = 4; then
-- case "$host" in
-- *-gnux32)
-- TARGET=X86_64
-- ;;
-- *)
-- TARGET=X86
-- ;;
-- esac
-- else
-- TARGET=X86_64;
-- fi
-+ i?86-*-*)
-+ TARGET=X86; TARGETDIR=x86
-+ ;;
-+
-+ x86_64-*-*)
-+ TARGET=X86_64; TARGETDIR=x86
- ;;
-
- ia64*-*-*)
