Browse Source

python,python3: export mk files outside of python package dirs

Since `lang/python` is it's own folder of Python packages
(for both Python 2 & 3), and these build rules are needed
in a lot of packages [especially Python packages],
putting them here makes sense architecturally,
to be shared.

This also helps get rid of the `include_mk` construct
which relies on OpenWrt core to provide, and seems
like a broken design idea that has persisted for a while.
Reason is: it requires that Python 2/3 be built to provide
these mk files for other Python packages,
which seems like a bad idea.

Long-term, there could be an issue where some other feeds
would require these mk files [e.g. telephony] for
some Python packages.
We'll see how we handle this a bit later.

For now we limit this to this feed.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
lilik-openwrt-22.03
Alexandru Ardelean 7 years ago
parent
commit
ccdc6bc530
10 changed files with 23 additions and 14 deletions
  1. +5
    -1
      lang/python/python-host.mk
  2. +0
    -0
      lang/python/python-package-install.sh
  3. +4
    -3
      lang/python/python-package.mk
  4. +0
    -0
      lang/python/python-version.mk
  5. +3
    -3
      lang/python/python/Makefile
  6. +5
    -1
      lang/python/python3-host.mk
  7. +0
    -0
      lang/python/python3-package-install.sh
  8. +3
    -3
      lang/python/python3-package.mk
  9. +0
    -0
      lang/python/python3-version.mk
  10. +3
    -3
      lang/python/python3/Makefile

lang/python/python/files/python-host.mk → lang/python/python-host.mk View File


lang/python/python/files/python-package-install.sh → lang/python/python-package-install.sh View File


lang/python/python/files/python-package.mk → lang/python/python-package.mk View File


lang/python/python/files/python-version.mk → lang/python/python-version.mk View File


+ 3
- 3
lang/python/python/Makefile View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
# For PYTHON_VERSION
include ./files/python-version.mk
include ../python-version.mk
PKG_NAME:=python
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
@ -22,10 +22,10 @@ PKG_LICENSE:=PSF
PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
# This file provides the necsessary host build variables
include ./files/python-host.mk
include ../python-host.mk
# For PyPackage
include ./files/python-package.mk
include ../python-package.mk
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1


lang/python/python3/files/python3-host.mk → lang/python/python3-host.mk View File


lang/python/python3/files/python3-package-install.sh → lang/python/python3-package-install.sh View File


lang/python/python3/files/python3-package.mk → lang/python/python3-package.mk View File


lang/python/python3/files/python3-version.mk → lang/python/python3-version.mk View File


+ 3
- 3
lang/python/python3/Makefile View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
# The file included below defines PYTHON_VERSION
include ./files/python3-version.mk
include ../python3-version.mk
PYTHON_VERSION:=$(PYTHON3_VERSION)
PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
@ -25,10 +25,10 @@ PKG_LICENSE:=PSF
PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
# This file provides the necsessary host build variables
include ./files/python3-host.mk
include ../python3-host.mk
# For Py3Package
include ./files/python3-package.mk
include ../python3-package.mk
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1


Loading…
Cancel
Save