aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffery To <jeffery.to@gmail.com>2023-03-06 11:54:02 +0800
committerJeffery To <jeffery.to@gmail.com>2023-04-24 16:20:35 +0800
commit63d13aa15f847d35d7f7473e1595de6c9d53f655 (patch)
tree71a1de6365b5561ba0d0937336a8bffa1f2ebbd8
parent30bd279461faf52b153714eac28b613eef594b90 (diff)
python-libraries: Update build options
This updates the build options for these packages to work with the pyproject.toml-based build process, and removes PYTHON3_PKG_FORCE_DISTUTILS_SETUP:=1. Signed-off-by: Jeffery To <jeffery.to@gmail.com>
5 files changed, 28 insertions, 36 deletions
diff --git a/lang/python/pillow/Makefile b/lang/python/pillow/Makefile
index 460f9434e..941f28f4e 100644
--- a/lang/python/pillow/Makefile
+++ b/lang/python/pillow/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pillow
PKG_VERSION:=9.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PYPI_NAME:=Pillow
PKG_HASH:=bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1
@@ -18,8 +18,6 @@ PKG_LICENSE:=HPND
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:python:pillow
-PYTHON3_PKG_FORCE_DISTUTILS_SETUP:=1
-
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk
@@ -38,17 +36,18 @@ define Package/python3-pillow/description
The friendly PIL fork
endef
-PYTHON3_PKG_SETUP_GLOBAL_ARGS += build_ext \
- --enable-zlib \
- --enable-jpeg \
- --enable-webp \
- --enable-webpmux \
- --enable-tiff \
- --enable-freetype \
- --disable-lcms \
- --disable-jpeg2000 \
- --disable-imagequant \
- --disable-platform-guessing
+PYTHON3_PKG_BUILD_CONFIG_SETTINGS += \
+ --global-option=build_ext \
+ --global-option=--enable-zlib \
+ --global-option=--enable-jpeg \
+ --global-option=--enable-webp \
+ --global-option=--enable-webpmux \
+ --global-option=--enable-tiff \
+ --global-option=--enable-freetype \
+ --global-option=--disable-lcms \
+ --global-option=--disable-jpeg2000 \
+ --global-option=--disable-imagequant \
+ --global-option=--disable-platform-guessing
$(eval $(call Py3Package,python3-pillow))
$(eval $(call BuildPackage,python3-pillow))
diff --git a/lang/python/python-curl/Makefile b/lang/python/python-curl/Makefile
index 560c05ad2..7d8d69e82 100644
--- a/lang/python/python-curl/Makefile
+++ b/lang/python/python-curl/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pycurl
PKG_VERSION:=7.45.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d23224ca
@@ -15,8 +15,6 @@ PKG_MAINTAINER:=Waldemar Konik <informatyk74@interia.pl>
PKG_LICENSE:=LGPL-2.1
PKG_LICENSE_FILES:=COPYING-LGPL
-PYTHON3_PKG_FORCE_DISTUTILS_SETUP:=1
-
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk
@@ -37,19 +35,19 @@ endef
PYTHON3_PKG_SETUP_ARGS:=
ifdef CONFIG_LIBCURL_OPENSSL
- PYTHON3_PKG_SETUP_ARGS+=--with-openssl
+ PYTHON3_PKG_BUILD_VARS:=PYCURL_SSL_LIBRARY=openssl
endif
ifdef CONFIG_LIBCURL_GNUTLS
- PYTHON3_PKG_SETUP_ARGS+=--with-gnutls
+ PYTHON3_PKG_BUILD_VARS:=PYCURL_SSL_LIBRARY=gnutls
endif
ifdef CONFIG_LIBCURL_MBEDTLS
- PYTHON3_PKG_SETUP_ARGS+=--with-mbedtls
+ PYTHON3_PKG_BUILD_VARS:=PYCURL_SSL_LIBRARY=mbedtls
endif
ifdef CONFIG_LIBCURL_WOLFSSL
- PYTHON3_PKG_SETUP_ARGS+=--with-wolfssl
+ PYTHON3_PKG_BUILD_VARS:=PYCURL_SSL_LIBRARY=wolfssl
endif
$(eval $(call Py3Package,python3-curl))
diff --git a/lang/python/python-evdev/Makefile b/lang/python/python-evdev/Makefile
index 6463daec7..bab726b54 100644
--- a/lang/python/python-evdev/Makefile
+++ b/lang/python/python-evdev/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=python-evdev
PKG_VERSION:=1.6.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_LICENSE:=BSD-3-Clause
PKG_MAINTAINER:=Paulo Costa <me@paulo.costa.nom.br>, Alexandru Ardelean <ardeleanalex@gmail.com>
@@ -18,8 +18,6 @@ PKG_MAINTAINER:=Paulo Costa <me@paulo.costa.nom.br>, Alexandru Ardelean <ardelea
PYPI_NAME:=evdev
PKG_HASH:=299db8628cc73b237fc1cc57d3c2948faa0756e2a58b6194b5bf81dc2081f1e3
-PYTHON3_PKG_FORCE_DISTUTILS_SETUP:=1
-
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk
@@ -41,10 +39,11 @@ endef
LINUX_EVDEV_HEADERS="$(LINUX_DIR)/include/uapi/linux/input.h:$(LINUX_DIR)/include/uapi/linux/input-event-codes.h"
-PYTHON3_PKG_SETUP_GLOBAL_ARGS:= \
- build build_ecodes \
- --evdev-headers="$(LINUX_EVDEV_HEADERS)" \
- build_ext
+PYTHON3_PKG_BUILD_CONFIG_SETTINGS:= \
+ --global-option=build \
+ --global-option=build_ecodes \
+ --global-option=--evdev-headers="$(LINUX_EVDEV_HEADERS)" \
+ --global-option=build_ext
$(eval $(call Py3Package,python3-evdev))
$(eval $(call BuildPackage,python3-evdev))
diff --git a/lang/python/python-gmpy2/Makefile b/lang/python/python-gmpy2/Makefile
index 3ba87a07b..899f67d1f 100644
--- a/lang/python/python-gmpy2/Makefile
+++ b/lang/python/python-gmpy2/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-gmpy2
PKG_VERSION:=2.0.8
-PKG_RELEASE:=5
+PKG_RELEASE:=6
PYPI_NAME:=gmpy2
PYPI_SOURCE_EXT:=zip
@@ -19,13 +19,11 @@ PKG_LICENSE:=LGPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING.LESSER
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
-PYTHON3_PKG_FORCE_DISTUTILS_SETUP:=1
-
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk
-PYTHON3_PKG_SETUP_ARGS:=--nompfr
+PYTHON3_PKG_BUILD_CONFIG_SETTINGS:=--global-option=--nompfr
define Package/python3-gmpy2
SECTION:=lang
diff --git a/lang/python/python-yaml/Makefile b/lang/python/python-yaml/Makefile
index 4e20fd209..7e02371e4 100644
--- a/lang/python/python-yaml/Makefile
+++ b/lang/python/python-yaml/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-yaml
PKG_VERSION:=6.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PYPI_NAME:=PyYAML
PKG_HASH:=68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2
@@ -21,8 +21,6 @@ PKG_CPE_ID:=cpe:/a:pyyaml_project:pyyaml
PKG_BUILD_DEPENDS:=python-cython/host
-PYTHON3_PKG_FORCE_DISTUTILS_SETUP:=1
-
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk
@@ -40,7 +38,7 @@ define Package/python3-yaml/description
PyYAML is a YAML parser and emitter for the Python programming language.
endef
-PYTHON3_PKG_SETUP_GLOBAL_ARGS:=--with-libyaml
+PYTHON3_PKG_BUILD_VARS:=PYYAML_FORCE_LIBYAML=1
PYTHON3_PKG_SETUP_ARGS:=
$(eval $(call Py3Package,python3-yaml))