Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2122 from commodo/python-backports-15.05

Browse source 
python: backport some patches from trunk to 15.05
This commit is contained in:
Hannu Nyman 2015-12-14 19:46:25 +02:00
commit d00825894a
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lang/python/Makefile
View file

@ -12,7 +12,7 @@ include ./files/python-package.mk
PKG_NAME:=python PKG_NAME:=python
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION) PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)
@ -29,7 +29,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=python/host PKG_BUILD_DEPENDS:=python/host
HOST_BUILD_DEPENDS:=bzip2/host HOST_BUILD_DEPENDS:=bzip2/host expat/host
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -222,6 +222,7 @@ HOST_CONFIGURE_ARGS+= \
--without-cxx-main \ --without-cxx-main \
--without-pymalloc \ --without-pymalloc \
--with-threads \ --with-threads \
--with-system-expat=$(STAGING_DIR_HOST) \
--prefix=$(STAGING_DIR_HOST) \ --prefix=$(STAGING_DIR_HOST) \
--with-ensurepip=upgrade \ --with-ensurepip=upgrade \
CONFIG_SITE= \ CONFIG_SITE= \

1
lang/python/files/python-package.mk
View file

@ -103,6 +103,7 @@ define Build/Compile/PyMod
cd $(PKG_BUILD_DIR)/$(strip $(1)); \ cd $(PKG_BUILD_DIR)/$(strip $(1)); \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
CCSHARED="$(TARGET_CC) $(FPIC)" \ CCSHARED="$(TARGET_CC) $(FPIC)" \
CXX="$(TARGET_CXX)" \
LD="$(TARGET_CC)" \ LD="$(TARGET_CC)" \
LDSHARED="$(TARGET_CC) -shared" \ LDSHARED="$(TARGET_CC) -shared" \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \

6
lang/python/patches/006-remove-debian-multiarch-support.patch
View file

@ -1,12 +1,14 @@
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index 7868b7b..9ae0ef2 100644 index 1d1ae72..511aed5 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -444,7 +444,6 @@ class PyBuildExt(build_ext): @@ -444,7 +444,8 @@ class PyBuildExt(build_ext):
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
if cross_compiling: if cross_compiling:
self.add_gcc_paths() self.add_gcc_paths()
- self.add_multiarch_paths() - self.add_multiarch_paths()
+ else:
+ self.add_multiarch_paths()
# Add paths specified in the environment variables LDFLAGS and # Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files. # CPPFLAGS for header and library files.