diff --git a/cross/boost/Makefile b/cross/boost/Makefile index 17ec6d08d10a..76b9f69295c2 100644 --- a/cross/boost/Makefile +++ b/cross/boost/Makefile @@ -5,50 +5,69 @@ PKG_DIR = $(PKG_NAME)_$(subst .,_,$(PKG_VERS)) PKG_DIST_NAME = $(PKG_DIR).$(PKG_EXT) PKG_DIST_SITE = http://sourceforge.net/projects/$(PKG_NAME)/files/$(PKG_NAME)/$(PKG_VERS) -DEPENDS = cross/bzip2 cross/zlib cross/python +DEPENDS = cross/bzip2 cross/zlib HOMEPAGE = http://www.boost.org/ COMMENT = Boost provides free peer-reviewed portable C++ source libraries. LICENSE = http://www.boost.org/LICENSE_1_0.txt -CONFIGURE_TARGET = myConfigure -COMPILE_TARGET = myCompile -INSTALL_TARGET = myInstall +CONFIGURE_TARGET = boost_configure +COMPILE_TARGET = boost_compile +INSTALL_TARGET = boost_install -# Build all if not told otherwise (will most likely fail) +# Build all if not told otherwise (we exclude python library when "all" selected) BOOST_LIBRARIES ?= all +# Expect already built python when python library selected +WITH_PYTHON_LIBRARY = +ifneq ($(findstring python,$(BOOST_LIBRARIES)),) +WITH_PYTHON_LIBRARY = 1 +# The packages depending on boost with python, must build python before. +include $(WORK_DIR)/python-cc.mk +PYTHON_NAME = $(basename $(notdir $(PYTHON_INTERPRETER))) +else ifneq ($(findstring $(BOOST_LIBRARIES), all),) +# exclude python library if "all" selected +CONFIGURE_ARGS += --without-libraries=python +endif + + # Useful variables for subst comma:= , empty:= space:= $(empty) $(empty) GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --with-toolset=gcc --with-libraries=$(subst $(space),$(comma),$(sort $(BOOST_LIBRARIES))) --prefix=$(STAGING_INSTALL_PREFIX) -CONFIGURE_ARGS += --with-python=$(WORK_DIR)/../../../native/python/work-native/install/usr/local/bin/python +CONFIGURE_ARGS += --with-toolset=gcc --with-libraries=$(subst $(space),$(comma),$(sort $(BOOST_LIBRARIES))) --prefix=$(STAGING_INSTALL_PREFIX) + +ifneq ($(strip $(WITH_PYTHON_LIBRARY)),) +CONFIGURE_ARGS += --with-python=$(WORK_DIR)/../../../native/$(PYTHON_NAME)/work-native/install/usr/local/bin/$(PYTHON_NAME) +ADDITIONAL_CFLAGS = -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) +ADDITIONAL_CXXFLAGS = -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) +endif include ../../mk/spksrc.cross-cc.mk --include $(WORK_DIR)/python-cc.mk ADDRESS_MODEL = 32 -ifeq ($(findstring $(ARCH),$(x64_ARCHES)),$(ARCH)) +ifeq ($(findstring $(ARCH),$(x64_ARCHES) $(ARM8_ARCHES)),$(ARCH)) ADDRESS_MODEL = 64 endif -.PHONY: myConfigure -myConfigure: +.PHONY: boost_configure +boost_configure: $(RUN) ./bootstrap.sh $(CONFIGURE_ARGS) -.PHONY: myCompile -myCompile: +.PHONY: boost_compile +boost_compile: @# Recreate user-config.jam to include python-cc.mk on second run @rm -rf $(WORK_DIR)/$(PKG_DIR)/user-config.jam @echo "using gcc : `$(TC_PATH)$(TC_PREFIX)gcc -dumpversion` : $(TC_PATH)$(TC_PREFIX)g++ : \"$(ADDRESS_MODEL)\" \"$(CFLAGS)\" \"$(CXXFLAGS)\" \"$(LDFLAGS)\" \"shared\" ; " > $(WORK_DIR)/$(PKG_DIR)/user-config.jam +ifneq ($(strip $(WITH_PYTHON)),) @echo "using python : $(PYTHON_VERSION) : : $(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) ;" >> $(WORK_DIR)/$(PKG_DIR)/user-config.jam +endif @echo "project : requirements $(OFLAGS) ;" >> $(WORK_DIR)/$(PKG_DIR)/user-config.jam $(RUN) ./b2 --user-config=$(WORK_DIR)/$(PKG_DIR)/user-config.jam -.PHONY: myInstall -myInstall: +.PHONY: boost_install +boost_install: $(RUN) ./b2 --user-config=$(WORK_DIR)/$(PKG_DIR)/user-config.jam install diff --git a/cross/duplicity/patches/001-update-pyhon2-path.patch b/cross/duplicity/patches/001-update-pyhon2-path.patch index eabd9b86d64e..d69f0d9d3457 100644 --- a/cross/duplicity/patches/001-update-pyhon2-path.patch +++ b/cross/duplicity/patches/001-update-pyhon2-path.patch @@ -13,5 +13,5 @@ -#!/usr/bin/env python2 +#!/usr/local/duplicity/env/bin/python2 # rdiffdir -- Extend rdiff functionality to directories - # Version 0.7.11 released December 31, 2016 + # Version 0.7.19 released April 29, 2019 # diff --git a/cross/gevent/Makefile b/cross/gevent/Makefile index eb5ef109a975..d97bc87ae4cd 100644 --- a/cross/gevent/Makefile +++ b/cross/gevent/Makefile @@ -1,8 +1,9 @@ PKG_NAME = gevent -PKG_VERS = 1.0.1 +PKG_VERS = 1.2.2 PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/g/${PKG_NAME} +PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/$(PKG_NAME)/$(PKG_NAME)/archive +PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/libev cross/c-ares @@ -11,12 +12,11 @@ HOMEPAGE = http://www.gevent.org/ COMMENT = gevent is a coroutine-based Python networking library that uses greenlet to provide a high-level synchronous API on top of the libev event loop LICENSE = MIT -INSTALL_TARGET = myInstall +INSTALL_TARGET = gevent_install include ../../mk/spksrc.python-wheel.mk -.PHONY: myInstall -myInstall: +.PHONY: gevent_install +gevent_install: @$(RUN) LIBEV_EMBED=FALSE CARES_EMBED=FALSE PYTHONPATH=$(PYTHONPATH) $(HOSTPYTHON) -c "import setuptools;__file__='setup.py';exec(compile(open(__file__).read().replace('\r\n', '\n'), __file__, 'exec'))" bdist_wheel -d $(WORK_DIR)/wheelhouse @rename -f 's/linux_i686/any/g' $(WORK_DIR)/wheelhouse/*.whl - diff --git a/cross/gevent/digests b/cross/gevent/digests index 84d5aecd5360..22628d9abf2f 100644 --- a/cross/gevent/digests +++ b/cross/gevent/digests @@ -1,3 +1,3 @@ -gevent-1.0.1.tar.gz SHA1 2cc1b6e1fa29b30ea881fa6a195e57faaf089ae8 -gevent-1.0.1.tar.gz SHA256 4627e215d058f71d95e6b26d9e7be4c263788a4756bd2858a93775f6c072df43 -gevent-1.0.1.tar.gz MD5 7b952591d1a0174d6eb6ac47bd975ab6 +gevent-1.2.2.tar.gz SHA1 6494cbb2660538fef476b80a071ef680c6cb8455 +gevent-1.2.2.tar.gz SHA256 c59072a2bac1829c6e0f19814b4b9fe726f9162a1762831a0c316ae27fa69eb2 +gevent-1.2.2.tar.gz MD5 594c1d2cb679fafaa3e5f6116907bc20 diff --git a/cross/python/Makefile b/cross/python/Makefile index 764e16778fcd..96ae2b3c8c62 100644 --- a/cross/python/Makefile +++ b/cross/python/Makefile @@ -1,14 +1,14 @@ PKG_NAME = python PKG_VERS_MAJOR = 2 PKG_VERS_MINOR = 7 -PKG_VERS_PATCH = 15 +PKG_VERS_PATCH = 18 PKG_VERS = $(PKG_VERS_MAJOR).$(PKG_VERS_MINOR).$(PKG_VERS_PATCH) PKG_EXT = tar.xz PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://www.python.org/ftp/python/$(PKG_VERS) PKG_DIR = Python-$(PKG_VERS) -DEPENDS = cross/zlib cross/openssl cross/sqlite cross/readline cross/ncurses cross/bzip2 +DEPENDS = cross/zlib cross/openssl cross/sqlite cross/readline cross/ncursesw cross/bzip2 DEPENDS += cross/berkeleydb-5.3 native/$(PKG_NAME) HOMEPAGE = http://www.python.org diff --git a/cross/python/PLIST b/cross/python/PLIST index 95d249120661..7c7258b2f1ac 100644 --- a/cross/python/PLIST +++ b/cross/python/PLIST @@ -1,7 +1,7 @@ -bin:bin/2to3 -bin:bin/idle -bin:bin/pydoc -bin:bin/smtpd.py +rsc:bin/2to3 +rsc:bin/idle +rsc:bin/pydoc +rsc:bin/smtpd.py lnk:bin/python lnk:bin/python2 bin:bin/python@PKG_SHORT_VERS@ diff --git a/cross/python/digests b/cross/python/digests index ebfdf8caca53..eff3dc2b182f 100644 --- a/cross/python/digests +++ b/cross/python/digests @@ -1,3 +1,3 @@ -Python-2.7.15.tar.xz SHA1 f99348a095ec4a6411c84c0d15343d11920c9724 -Python-2.7.15.tar.xz SHA256 22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574 -Python-2.7.15.tar.xz MD5 a80ae3cc478460b922242f43a1b4094d +Python-2.7.18.tar.xz SHA1 678d4cf483a1c92efd347ee8e1e79326dc82810b +Python-2.7.18.tar.xz SHA256 b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 +Python-2.7.18.tar.xz MD5 fd6cc8ec0a78c44036f825e739f36e5a diff --git a/cross/readline/Makefile b/cross/readline/Makefile index 756ca2811516..7dc84e60835a 100644 --- a/cross/readline/Makefile +++ b/cross/readline/Makefile @@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = ftp://ftp.gnu.org/gnu/$(PKG_NAME) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/ncurses +DEPENDS = cross/ncursesw HOMEPAGE = http://www.gnu.org/s/readline COMMENT = Set of functions for use by applications that allow users to edit command lines as they are typed in. diff --git a/cross/setuptools/Makefile b/cross/setuptools/Makefile index 0ab3c0accb7b..13f2788598a2 100644 --- a/cross/setuptools/Makefile +++ b/cross/setuptools/Makefile @@ -1,5 +1,5 @@ PKG_NAME = setuptools -PKG_VERS = 44.0.0 +PKG_VERS = 44.1.0 PKG_EXT = zip PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/s/$(PKG_NAME) diff --git a/cross/setuptools/digests b/cross/setuptools/digests index 2d7ec0e3f325..17205916f798 100644 --- a/cross/setuptools/digests +++ b/cross/setuptools/digests @@ -1,3 +1,3 @@ -setuptools-44.0.0.zip SHA1 d3b0c646c298a30d7446a43e5bcf367ed29d17d7 -setuptools-44.0.0.zip SHA256 e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008 -setuptools-44.0.0.zip MD5 32b6cdce670ce462086d246bea181e9d +setuptools-44.1.0.zip SHA1 0374fa50a4cc49d72413726084b76afcbc427567 +setuptools-44.1.0.zip SHA256 794a96b0c1dc6f182c36b72ab70d7e90f1d59f7a132e6919bb37b4fd4d424aca +setuptools-44.1.0.zip MD5 f17522189e7c0262b67e590d529d4e06 diff --git a/native/python/Makefile b/native/python/Makefile index 9432fc3d8b9c..3f3e3d1fd843 100644 --- a/native/python/Makefile +++ b/native/python/Makefile @@ -1,5 +1,5 @@ PKG_NAME = python -PKG_VERS = 2.7.15 +PKG_VERS = 2.7.18 PKG_EXT = tar.xz PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = http://www.python.org/ftp/python/$(PKG_VERS) @@ -25,8 +25,8 @@ PIP = $(WORK_DIR)/install/usr/local/bin/pip python_post_install: $(WORK_DIR)/python-native.mk @$(MSG) Installing setuptools, pip and cffi @$(RUN) wget https://bootstrap.pypa.io/get-pip.py -O - | $(PYTHON) - @$(PIP) install "setuptools==40.6.2" - @$(PIP) install "cffi==1.11.5" + @$(PIP) install "setuptools==44.1.0" + @$(PIP) install "cffi==1.14.0" $(WORK_DIR)/python-native.mk: @echo PIP=$(PIP_NATIVE) >> $@ diff --git a/native/python/digests b/native/python/digests index ebfdf8caca53..eff3dc2b182f 100644 --- a/native/python/digests +++ b/native/python/digests @@ -1,3 +1,3 @@ -Python-2.7.15.tar.xz SHA1 f99348a095ec4a6411c84c0d15343d11920c9724 -Python-2.7.15.tar.xz SHA256 22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574 -Python-2.7.15.tar.xz MD5 a80ae3cc478460b922242f43a1b4094d +Python-2.7.18.tar.xz SHA1 678d4cf483a1c92efd347ee8e1e79326dc82810b +Python-2.7.18.tar.xz SHA256 b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 +Python-2.7.18.tar.xz MD5 fd6cc8ec0a78c44036f825e739f36e5a diff --git a/spk/deluge/Makefile b/spk/deluge/Makefile index 89ea8ea548da..d051334bc064 100644 --- a/spk/deluge/Makefile +++ b/spk/deluge/Makefile @@ -9,8 +9,8 @@ WHEELS = src/requirements.txt SPK_DEPENDS = "python>=2.7.18" REQUIRED_DSM = 5.0 -# archs lacking C++11 compiler (88f6281 and ppc archs except QorIQ) required by cross/libtorrent -UNSUPPORTED_ARCHS = 88f6281 powerpc ppc824x ppc853x ppc854x +# archs lacking C++11 compiler (88f6281, hi3535 and ppc archs except QorIQ) required by cross/libtorrent +UNSUPPORTED_ARCHS = 88f6281 hi3535 powerpc ppc824x ppc853x ppc854x MAINTAINER = Safihre DESCRIPTION = Deluge is a full-featured BitTorrent client for Linux, OS X, Unix and Windows. It uses libtorrent in its backend and features multiple user-interfaces including: GTK+, web and console. It has been designed using the client server model with a daemon process that handles all the bittorrent activity. The Deluge daemon is able to run on headless machines with the user-interfaces being able to connect remotely from any platform. This package is intended for advanced users. diff --git a/spk/python/Makefile b/spk/python/Makefile index 302301afc9ee..f486adcdf610 100644 --- a/spk/python/Makefile +++ b/spk/python/Makefile @@ -1,7 +1,7 @@ SPK_NAME = python SPK_SHORT_VERS = 2.7 -SPK_VERS = $(SPK_SHORT_VERS).15 -SPK_REV = 20 +SPK_VERS = $(SPK_SHORT_VERS).18 +SPK_REV = 22 SPK_ICON = src/python.png DEPENDS = cross/busybox cross/$(SPK_NAME) @@ -24,7 +24,7 @@ DESCRIPTION_SPN = Lenguaje de programación Python 2.7. RELOAD_UI = yes STARTABLE = no DISPLAY_NAME = Python -CHANGELOG = "1. Update to Python 2.7.15
2. Update modules" +CHANGELOG = "1. Update to Python 2.7.18
2. Update dependencies" HOMEPAGE = http://www.python.org LICENSE = PSF diff --git a/spk/python/src/requirements.txt b/spk/python/src/requirements.txt index 7109b0b345fa..0a46c7cb9c1a 100644 --- a/spk/python/src/requirements.txt +++ b/spk/python/src/requirements.txt @@ -1,58 +1,58 @@ ## Modules cross-compiled via spksrc.python-wheel.mk ## These modules require patches or have cross dependencies # Included for reference -#lxml==3.7.2 -#m2crypto==0.25.0 +#lxml==4.5.0 +#m2crypto==0.25.1 #msgpack-python==0.5.6 #pillow==5.3.0 #pyalsa==1.0.29 #pyaudio==0.2.9 #pycrypto==2.6.1 #pycurl==7.43.0 -#pyyaml==3.13 +#PyYAML==5.3 #pyzmq==16.0.2 #uwsgi==2.0.14 -#pycparser==2.18 +#pycparser==2.19 ## Cross-compiled via spksrc.wheel.mk -markupsafe==1.1.0 -psutil==5.4.8 -pymongo==3.7.2 -sqlalchemy==1.2.10 +markupsafe==1.1.1 +psutil==5.7.0 +pymongo==3.10.1 +sqlalchemy==1.3.17 # General support -six==1.11.0 -virtualenv==16.1.0 +six==1.15.0 +virtualenv==16.7.10 # Cheetah and dependencies cheetah==2.4.4 -markdown==2.6.11 +markdown==3.1.1 # Cryptography/pyOpenSSL/M2Crypto dependencies # These also depends on cross/cffi and cross/openssl, # which are installed through cross/bcrypt -pyOpenSSL==18.0.0 -#cryptography==2.4.2 now built as buildtime dependency -pyasn1==0.4.4 -asn1crypto==0.24.0 -enum34==1.1.6 -idna==2.7 -ipaddress==1.0.22 -typing==3.6.6 +pyOpenSSL==19.1.0 +#cryptography==2.9.2 now built as buildtime dependency +pyasn1==0.4.8 +asn1crypto==1.3.0 +enum34==1.1.10 +idna==2.9 +ipaddress==1.0.23 +typing==3.7.4.1 # Twisted and dependencies -twisted==18.9.0 -zope.interface==4.6.0 -Automat==0.7.0 +twisted==20.3.0 +zope.interface==5.1.0 +Automat==20.2.0 constantly==15.1.0 -hyperlink==18.0.0 -attrs==18.2.0 +hyperlink==19.0.0 +attrs==19.3.0 incremental==17.5.0 # Requests and dependencies # Always get latest certificates! -requests==2.20.1 -urllib3==1.24.1 +requests==2.23.0 +urllib3==1.25.9 chardet==3.0.4 certifi