LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #2596 from commodo/python-update-staging-dir-host 

python: change $(STAGING_DIR)/host to $(STAGING_DIR_HOST)
lilik-openwrt-22.03
Hannu Nyman 9 years ago
parent
1882c459c9 c8e8aae579
commit
35a2cd6087
20 changed files with 31 additions and 31 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -9
      lang/python/Makefile
  2. +4
    -4
      lang/python/files/python-host.mk
  3. +1
    -1
      lang/python/files/python-package-codecs.mk
  4. +1
    -1
      lang/python/files/python-package-compiler.mk
  5. +1
    -1
      lang/python/files/python-package-ctypes.mk
  6. +1
    -1
      lang/python/files/python-package-db.mk
  7. +1
    -1
      lang/python/files/python-package-decimal.mk
  8. +1
    -1
      lang/python/files/python-package-dev.mk
  9. +1
    -1
      lang/python/files/python-package-distutils.mk
  10. +1
    -1
      lang/python/files/python-package-email.mk
  11. +1
    -1
      lang/python/files/python-package-gdbm.mk
  12. +1
    -1
      lang/python/files/python-package-lib2to3.mk
  13. +1
    -1
      lang/python/files/python-package-logging.mk
  14. +1
    -1
      lang/python/files/python-package-multiprocessing.mk
  15. +1
    -1
      lang/python/files/python-package-ncurses.mk
  16. +1
    -1
      lang/python/files/python-package-openssl.mk
  17. +1
    -1
      lang/python/files/python-package-pydoc.mk
  18. +1
    -1
      lang/python/files/python-package-sqlite3.mk
  19. +1
    -1
      lang/python/files/python-package-unittest.mk
  20. +1
    -1
      lang/python/files/python-package-xml.mk

+ 9
- 9
lang/python/Makefile View File

@ -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))


+ 4
- 4
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.
# 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) \
, \


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


+ 1
- 1
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.
# See /LICENSE for more information.


Write Preview
Loading…
Cancel
Save