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

python: change $(STAGING_DIR)/host to $(STAGING_DIR_HOST)

Browse source 
It seems that this can become an issue.
Found when building python3-setuptools from packages/trunk
in openwrt/15.05.

python3-setuptools is not in packages/for-15.05

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2016-04-14 11:54:40 +03:00
parent fb9a4c8823
commit c8e8aae579
20 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
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:=6 PKG_RELEASE:=7
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
@ -144,13 +144,13 @@ define Build/InstallDev
$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
$(1)/usr/include/ $(1)/usr/include/
$(CP) \ $(CP) \
$(STAGING_DIR)/host/lib/python$(PYTHON_VERSION) \ $(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \
$(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \
$(1)/usr/lib/ $(1)/usr/lib/
$(CP) \ $(CP) \
$(STAGING_DIR)/host/lib/pkgconfig/python.pc \ $(STAGING_DIR_HOST)/lib/pkgconfig/python.pc \
$(STAGING_DIR)/host/lib/pkgconfig/python2.pc \ $(STAGING_DIR_HOST)/lib/pkgconfig/python2.pc \
$(STAGING_DIR)/host/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ $(STAGING_DIR_HOST)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \
$(1)/usr/lib/pkgconfig $(1)/usr/lib/pkgconfig
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \ $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \
@ -221,16 +221,16 @@ HOST_CONFIGURE_ARGS+= \
--without-cxx-main \ --without-cxx-main \
--without-pymalloc \ --without-pymalloc \
--with-threads \ --with-threads \
--with-system-expat=$(STAGING_DIR)/host \ --with-system-expat="$(STAGING_DIR_HOST)" \
--with-system-ffi="$(STAGING_DIR)/host" \ --with-system-ffi="$(STAGING_DIR_HOST)" \
--with-ensurepip=upgrade \ --with-ensurepip=upgrade \
CONFIG_SITE= \ CONFIG_SITE= \
CFLAGS="$(HOST_CFLAGS)" CFLAGS="$(HOST_CFLAGS)"
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR)/host/bin/ $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
$(MAKE) -C $(HOST_BUILD_DIR) install $(MAKE) -C $(HOST_BUILD_DIR) install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen2 $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen2
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

8
lang/python/files/python-host.mk
View file

@ -1,11 +1,11 @@
# #
# Copyright (C) 2015-2016 OpenWrt.org # Copyright (C) 2016-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
HOST_PYTHON_DIR:=$(STAGING_DIR)/host HOST_PYTHON_DIR:=$(STAGING_DIR_HOST)
HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION) HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION)
HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION) HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION)
@ -13,7 +13,7 @@ HOST_PYTHON_PKG_DIR:=/lib/python$(PYTHON_VERSION)/site-packages
HOST_PYTHON_BIN:=$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION) HOST_PYTHON_BIN:=$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION)
HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR)/host/$(HOST_PYTHON_PKG_DIR) HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR_HOST)/$(HOST_PYTHON_PKG_DIR)
define HostPython define HostPython
if [ "$(strip $(3))" == "HOST" ]; then \ if [ "$(strip $(3))" == "HOST" ]; then \
@ -44,7 +44,7 @@ define Build/Compile/HostPyMod
LDSHARED="$(HOSTCC) -shared" \ LDSHARED="$(HOSTCC) -shared" \
CFLAGS="$(HOST_CFLAGS)" \ CFLAGS="$(HOST_CFLAGS)" \
CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON_INC_DIR)" \ CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON_INC_DIR)" \
LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR)/host/lib" \ LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR_HOST)/lib" \
_PYTHON_HOST_PLATFORM=linux2 \ _PYTHON_HOST_PLATFORM=linux2 \
$(3) \ $(3) \
, \ , \

2
lang/python/files/python-package-codecs.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-compiler.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-ctypes.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-db.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-decimal.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-dev.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-distutils.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-email.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-gdbm.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-lib2to3.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-logging.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-multiprocessing.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-ncurses.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-openssl.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-pydoc.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-sqlite3.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-unittest.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.

2
lang/python/files/python-package-xml.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.