diff options
Diffstat (limited to 'lang/python')
20 files changed, 31 insertions, 31 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile index 63af64de5..56e271618 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -12,7 +12,7 @@ include ./files/python-package.mk PKG_NAME:=python PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz 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) \ $(1)/usr/include/ $(CP) \ - $(STAGING_DIR)/host/lib/python$(PYTHON_VERSION) \ + $(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(1)/usr/lib/ $(CP) \ - $(STAGING_DIR)/host/lib/pkgconfig/python.pc \ - $(STAGING_DIR)/host/lib/pkgconfig/python2.pc \ - $(STAGING_DIR)/host/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ + $(STAGING_DIR_HOST)/lib/pkgconfig/python.pc \ + $(STAGING_DIR_HOST)/lib/pkgconfig/python2.pc \ + $(STAGING_DIR_HOST)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ $(1)/usr/lib/pkgconfig $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \ @@ -221,16 +221,16 @@ HOST_CONFIGURE_ARGS+= \ --without-cxx-main \ --without-pymalloc \ --with-threads \ - --with-system-expat=$(STAGING_DIR)/host \ - --with-system-ffi="$(STAGING_DIR)/host" \ + --with-system-expat="$(STAGING_DIR_HOST)" \ + --with-system-ffi="$(STAGING_DIR_HOST)" \ --with-ensurepip=upgrade \ CONFIG_SITE= \ CFLAGS="$(HOST_CFLAGS)" define Host/Install - $(INSTALL_DIR) $(STAGING_DIR)/host/bin/ + $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ $(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 $(eval $(call HostBuild)) diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk index 8736d29ad..671189c32 100644 --- a/lang/python/files/python-host.mk +++ b/lang/python/files/python-host.mk @@ -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. # 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_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_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 if [ "$(strip $(3))" == "HOST" ]; then \ @@ -44,7 +44,7 @@ define Build/Compile/HostPyMod LDSHARED="$(HOSTCC) -shared" \ CFLAGS="$(HOST_CFLAGS)" \ 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 \ $(3) \ , \ diff --git a/lang/python/files/python-package-codecs.mk b/lang/python/files/python-package-codecs.mk index d6e183500..7d3c615f3 100644 --- a/lang/python/files/python-package-codecs.mk +++ b/lang/python/files/python-package-codecs.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-compiler.mk b/lang/python/files/python-package-compiler.mk index fbe8bf2e6..c840ce103 100644 --- a/lang/python/files/python-package-compiler.mk +++ b/lang/python/files/python-package-compiler.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-ctypes.mk b/lang/python/files/python-package-ctypes.mk index 66b303310..5c34b7a7c 100644 --- a/lang/python/files/python-package-ctypes.mk +++ b/lang/python/files/python-package-ctypes.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-db.mk b/lang/python/files/python-package-db.mk index 26f35d882..a257820a3 100644 --- a/lang/python/files/python-package-db.mk +++ b/lang/python/files/python-package-db.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-decimal.mk b/lang/python/files/python-package-decimal.mk index 33e3a21d2..578486d86 100644 --- a/lang/python/files/python-package-decimal.mk +++ b/lang/python/files/python-package-decimal.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-dev.mk b/lang/python/files/python-package-dev.mk index 2f807b283..6a2b942f4 100644 --- a/lang/python/files/python-package-dev.mk +++ b/lang/python/files/python-package-dev.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-distutils.mk b/lang/python/files/python-package-distutils.mk index f5119fac3..a139ddba0 100644 --- a/lang/python/files/python-package-distutils.mk +++ b/lang/python/files/python-package-distutils.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-email.mk b/lang/python/files/python-package-email.mk index 51fa8d12a..8c15583dc 100644 --- a/lang/python/files/python-package-email.mk +++ b/lang/python/files/python-package-email.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-gdbm.mk b/lang/python/files/python-package-gdbm.mk index 8e0b16f9c..23c7a293c 100644 --- a/lang/python/files/python-package-gdbm.mk +++ b/lang/python/files/python-package-gdbm.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-lib2to3.mk b/lang/python/files/python-package-lib2to3.mk index 5d6942d65..925cfe204 100644 --- a/lang/python/files/python-package-lib2to3.mk +++ b/lang/python/files/python-package-lib2to3.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-logging.mk b/lang/python/files/python-package-logging.mk index f45de35dc..efef5314a 100644 --- a/lang/python/files/python-package-logging.mk +++ b/lang/python/files/python-package-logging.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-multiprocessing.mk b/lang/python/files/python-package-multiprocessing.mk index 2a9f5b185..ccb55f59b 100644 --- a/lang/python/files/python-package-multiprocessing.mk +++ b/lang/python/files/python-package-multiprocessing.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-ncurses.mk b/lang/python/files/python-package-ncurses.mk index bab941559..d952b5034 100644 --- a/lang/python/files/python-package-ncurses.mk +++ b/lang/python/files/python-package-ncurses.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-openssl.mk b/lang/python/files/python-package-openssl.mk index 4d897eb81..dbf6fe180 100644 --- a/lang/python/files/python-package-openssl.mk +++ b/lang/python/files/python-package-openssl.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-pydoc.mk b/lang/python/files/python-package-pydoc.mk index ca27f9b36..1e3c38529 100644 --- a/lang/python/files/python-package-pydoc.mk +++ b/lang/python/files/python-package-pydoc.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-sqlite3.mk b/lang/python/files/python-package-sqlite3.mk index c5abb122e..22a6fbcd2 100644 --- a/lang/python/files/python-package-sqlite3.mk +++ b/lang/python/files/python-package-sqlite3.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-unittest.mk b/lang/python/files/python-package-unittest.mk index 6e1ab552d..3c93f5136 100644 --- a/lang/python/files/python-package-unittest.mk +++ b/lang/python/files/python-package-unittest.mk @@ -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. # See /LICENSE for more information. diff --git a/lang/python/files/python-package-xml.mk b/lang/python/files/python-package-xml.mk index bb82f0170..28e734ea4 100644 --- a/lang/python/files/python-package-xml.mk +++ b/lang/python/files/python-package-xml.mk @@ -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. # See /LICENSE for more information. |