Merge pull request #12754 from jefferyto/python-host-platform
python3: Use default _PYTHON_HOST_PLATFORM
This commit is contained in:
commit
f424859f93
|
@ -32,7 +32,6 @@ HOST_PYTHON3_VARS = \
|
|||
CFLAGS="$(HOST_CFLAGS)" \
|
||||
CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON3_INC_DIR)" \
|
||||
LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON3_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR_HOSTPKG)/lib" \
|
||||
_PYTHON_HOST_PLATFORM=linux2 \
|
||||
PYTHONPATH="$(HOST_PYTHON3PATH)" \
|
||||
PYTHONDONTWRITEBYTECODE=0 \
|
||||
PYTHONOPTIMIZE=""
|
||||
|
@ -57,6 +56,7 @@ define HostPython3/PipInstall
|
|||
--disable-pip-version-check \
|
||||
--cache-dir "$(DL_DIR)/pip-cache" \
|
||||
install \
|
||||
--no-binary :all: \
|
||||
$(1)
|
||||
endef
|
||||
|
||||
|
|
|
@ -20,6 +20,8 @@ PYTHON3:=python$(PYTHON3_VERSION)
|
|||
|
||||
PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
|
||||
|
||||
-include $(PYTHON3_LIB_DIR)/config-$(PYTHON3_VERSION)/Makefile-vars
|
||||
|
||||
# These configure args are needed in detection of path to Python header files
|
||||
# using autotools.
|
||||
CONFIGURE_ARGS += \
|
||||
|
@ -36,7 +38,7 @@ PYTHON3_VARS = \
|
|||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON3_INC_DIR)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS) -lpython$(PYTHON3_VERSION)" \
|
||||
_PYTHON_HOST_PLATFORM=linux2 \
|
||||
_PYTHON_HOST_PLATFORM="$(_PYTHON_HOST_PLATFORM)" \
|
||||
__PYVENV_LAUNCHER__="/usr/bin/$(PYTHON3)" \
|
||||
PYTHONPATH="$(PYTHON3PATH)" \
|
||||
PYTHONDONTWRITEBYTECODE=1 \
|
||||
|
|
|
@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
|
|||
include ../python3-version.mk
|
||||
|
||||
PKG_NAME:=python3
|
||||
PKG_RELEASE:=2
|
||||
PKG_RELEASE:=3
|
||||
PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
|
||||
|
||||
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
|
||||
|
@ -129,7 +129,6 @@ TARGET_CONFIGURE_OPTS+= \
|
|||
READELF="$(TARGET_CROSS)readelf"
|
||||
|
||||
MAKE_FLAGS+=\
|
||||
CROSS_COMPILE=yes \
|
||||
LD="$(TARGET_CC)"
|
||||
|
||||
EXTRA_CFLAGS+= \
|
||||
|
@ -137,13 +136,6 @@ EXTRA_CFLAGS+= \
|
|||
EXTRA_LDFLAGS+= \
|
||||
-L$(PKG_BUILD_DIR)
|
||||
|
||||
PYTHON_FOR_BUILD:= \
|
||||
_PYTHON_PROJECT_BASE=$(PKG_BUILD_DIR) \
|
||||
_PYTHON_HOST_PLATFORM=linux2 \
|
||||
PYTHONPATH="$(PKG_BUILD_DIR)/Lib:$(PKG_BUILD_DIR)/build/lib.linux2-$(PYTHON3_VERSION)" \
|
||||
_PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata \
|
||||
$(HOST_PYTHON3_BIN)
|
||||
|
||||
DISABLE_BLUETOOTH:= \
|
||||
ac_cv_header_bluetooth_bluetooth_h=no \
|
||||
ac_cv_header_bluetooth_h=no
|
||||
|
@ -159,7 +151,6 @@ CONFIGURE_ARGS+= \
|
|||
$(if $(findstring mips,$(CONFIG_ARCH)),,--with-lto) \
|
||||
CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \
|
||||
OPT="$(TARGET_CFLAGS)" \
|
||||
PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)" \
|
||||
$(if $(CONFIG_PYTHON3_BLUETOOTH_SUPPORT),,$(DISABLE_BLUETOOTH))
|
||||
|
||||
define Build/Prepare
|
||||
|
@ -220,6 +211,10 @@ define Build/InstallDev
|
|||
$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON3_VERSION) \
|
||||
$(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON3_VERSION).so* \
|
||||
$(1)/usr/lib/
|
||||
grep \
|
||||
'^_PYTHON_HOST_PLATFORM=' \
|
||||
$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON3_VERSION)/config-$(PYTHON3_VERSION)/Makefile > \
|
||||
$(1)/usr/lib/python$(PYTHON3_VERSION)/config-$(PYTHON3_VERSION)/Makefile-vars
|
||||
$(CP) \
|
||||
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/python*.pc \
|
||||
$(1)/usr/lib/pkgconfig
|
||||
|
|
|
@ -40,6 +40,15 @@
|
|||
# Here are a couple of targets for MacOSX again, to install a full
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2951,7 +2951,7 @@ $as_echo_n "checking for python interpre
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
|
||||
$as_echo "$interp" >&6; }
|
||||
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
|
||||
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$interp
|
||||
fi
|
||||
elif test "$cross_compiling" = maybe; then
|
||||
as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
|
||||
@@ -15213,7 +15213,7 @@ else
|
||||
fi
|
||||
|
||||
|
@ -51,6 +60,15 @@
|
|||
LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -75,7 +75,7 @@ if test "$cross_compiling" = yes; then
|
||||
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
|
||||
fi
|
||||
AC_MSG_RESULT($interp)
|
||||
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
|
||||
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$interp
|
||||
fi
|
||||
elif test "$cross_compiling" = maybe; then
|
||||
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
|
||||
@@ -4688,7 +4688,7 @@ fi
|
||||
|
||||
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
||||
|
|
Loading…
Reference in New Issue