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

python3: update using python updates as template

Browse source 
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2015-01-19 20:22:41 +02:00
parent f05378ec6d
commit 8c057f39d8
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lang/python/Makefile
View file

@ -115,8 +115,7 @@ define Build/InstallDev
$(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/python3.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) \

8
lang/python3/Makefile
View file

@ -31,7 +31,7 @@ HOST_BUILD_PARALLEL:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION) 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:=libffi/host python3/host PKG_BUILD_DEPENDS:=python3/host
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -57,7 +57,7 @@ endef
define Package/python3-base define Package/python3-base
$(call Package/python3/Default) $(call Package/python3/Default)
TITLE:=Python $(PYTHON_VERSION) interpreter TITLE:=Python $(PYTHON_VERSION) interpreter
DEPENDS:=+libpthread +zlib +libffi DEPENDS:=+libpthread +zlib +libffi +libopenssl
endef endef
define Package/python3-base/description define Package/python3-base/description
@ -67,7 +67,7 @@ endef
define Package/python3 define Package/python3
$(call Package/python3/Default) $(call Package/python3/Default)
DEPENDS:=+python3-base +libncursesw +libbz2 +libgdbm +libsqlite3 +libdb47 +libopenssl DEPENDS:=+python3-base +libncursesw +libbz2 +libgdbm +libsqlite3 +libdb47
endef endef
define Package/python3/description define Package/python3/description
@ -170,9 +170,9 @@ endef
HOST_CONFIGURE_ARGS+= \ HOST_CONFIGURE_ARGS+= \
--without-cxx-main \ --without-cxx-main \
--without-pymalloc \ --without-pymalloc \
--without-ensurepip \
--with-threads \ --with-threads \
--prefix=$(STAGING_DIR_HOST) \ --prefix=$(STAGING_DIR_HOST) \
--with-ensurepip=upgrade \
CONFIG_SITE= \ CONFIG_SITE= \
OPT="$(HOST_CFLAGS)" OPT="$(HOST_CFLAGS)"

15
lang/python3/files/python3-package.mk
View file

@ -20,8 +20,7 @@ PYTHON3:=python$(PYTHON3_VERSION)
HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON3_VERSION) HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON3_VERSION)
HOST_PYTHON3_BIN:=$(STAGING_DIR_HOST)/bin/python3 HOST_PYTHON3_BIN:=$(STAGING_DIR_HOST)/bin/python3
PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR) PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
PYTHON3PATH+=:$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
define HostPython3 define HostPython3
( export PYTHONPATH="$(PYTHON3PATH)"; \ ( export PYTHONPATH="$(PYTHON3PATH)"; \
export PYTHONOPTIMIZE=""; \ export PYTHONOPTIMIZE=""; \
@ -39,6 +38,14 @@ ifdef CONFIG_USE_MIPS16
endif endif
define Py3Package define Py3Package
# Add default PyPackage filespec none defined
ifndef Py3Package/$(1)/filespec
define Py3Package/$(1)/filespec
+|$(PYTHON3_PKG_DIR)
endef
endif
$(call shexport,Py3Package/$(1)/filespec) $(call shexport,Py3Package/$(1)/filespec)
define Package/$(1)/install define Package/$(1)/install
@ -46,6 +53,7 @@ define Py3Package
@echo "$$$$$$$$$$(call shvar,Py3Package/$(1)/filespec)" | ( \ @echo "$$$$$$$$$$(call shvar,Py3Package/$(1)/filespec)" | ( \
IFS='|'; \ IFS='|'; \
while read fop fspec fperm; do \ while read fop fspec fperm; do \
fop=`echo "$$$$$$$$fop" | tr -d ' \t\n'`; \
if [ "$$$$$$$$fop" = "+" ]; then \ if [ "$$$$$$$$fop" = "+" ]; then \
if [ ! -e "$(PKG_INSTALL_DIR)$$$$$$$$fspec" ]; then \ if [ ! -e "$(PKG_INSTALL_DIR)$$$$$$$$fspec" ]; then \
echo "File not found '$(PKG_INSTALL_DIR)$$$$$$$$fspec'"; \ echo "File not found '$(PKG_INSTALL_DIR)$$$$$$$$fspec'"; \
@ -90,7 +98,7 @@ define Build/Compile/Py3Mod
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON3_INC_DIR)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON3_INC_DIR)" \
LDFLAGS="$(TARGET_LDFLAGS) -lpython$(PYTHON3_VERSION)" \ LDFLAGS="$(TARGET_LDFLAGS) -lpython$(PYTHON3_VERSION)" \
_PYTHON_HOST_PLATFORM="linux-$(ARCH)" \ _PYTHON_HOST_PLATFORM=linux2 \
__PYVENV_LAUNCHER__="/usr/bin/$(PYTHON3)" \ __PYVENV_LAUNCHER__="/usr/bin/$(PYTHON3)" \
$(3) \ $(3) \
, \ , \
@ -98,3 +106,4 @@ define Build/Compile/Py3Mod
) )
find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
endef endef