From a855e21bcbcabfc6fec0c1c34bc3346180031a34 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 28 Oct 2022 19:00:36 -0600 Subject: [PATCH] package/python-ujson: bump to version 5.5.0 Switch to now supported system double-conversion library. Disable built in strip so that stripping is handled by buildroot. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-ujson/Config.in | 3 ++- package/python-ujson/python-ujson.hash | 4 ++-- package/python-ujson/python-ujson.mk | 10 +++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package/python-ujson/Config.in b/package/python-ujson/Config.in index 7af03e6497..31b4d484d8 100644 --- a/package/python-ujson/Config.in +++ b/package/python-ujson/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_UJSON bool "python-ujson" - depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_INSTALL_LIBSTDCPP # double-conversion + select BR2_PACKAGE_DOUBLE_CONVERSION help UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 3. diff --git a/package/python-ujson/python-ujson.hash b/package/python-ujson/python-ujson.hash index e88e273145..27df5aa355 100644 --- a/package/python-ujson/python-ujson.hash +++ b/package/python-ujson/python-ujson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ujson/json -md5 2c7ffd2bf23f6f07da3a0cbf5ff5c2f0 ujson-5.2.0.tar.gz -sha256 163191b88842d874e081707d35de2e205e0e396e70fd068d1038879bca8b17ad ujson-5.2.0.tar.gz +md5 73b42e3f4bf3130073cfffbd82608275 ujson-5.5.0.tar.gz +sha256 b25077a971c7da47bd6846a912a747f6963776d90720c88603b1b55d81790780 ujson-5.5.0.tar.gz # Locally computed sha256 checksums sha256 6a00a8f8b4050303368b694147bde1aed9c96bdff869c181dbbf3ccb784a1501 LICENSE.txt diff --git a/package/python-ujson/python-ujson.mk b/package/python-ujson/python-ujson.mk index 8eb5f6a0a7..95cb0ebad1 100644 --- a/package/python-ujson/python-ujson.mk +++ b/package/python-ujson/python-ujson.mk @@ -4,12 +4,16 @@ # ################################################################################ -PYTHON_UJSON_VERSION = 5.2.0 +PYTHON_UJSON_VERSION = 5.5.0 PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz -PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/e4/fc/2dee0e78162aa1ad03dadde9a9b5c281d6f8bb0eed6810a270486d8fc041 +PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/6e/4a/03ddad85a10dd52e209993a14afa0cb0dc5c348e4647329f1c53856ad9e6 PYTHON_UJSON_SETUP_TYPE = setuptools PYTHON_UJSON_LICENSE = BSD-3-Clause PYTHON_UJSON_LICENSE_FILES = LICENSE.txt -PYTHON_UJSON_DEPENDENCIES = host-python-setuptools-scm +PYTHON_UJSON_DEPENDENCIES = host-python-setuptools-scm double-conversion +PYTHON_UJSON_ENV = \ + UJSON_BUILD_DC_INCLUDES="$(STAGING_DIR)/usr/include/double-conversion" \ + UJSON_BUILD_DC_LIBS="-ldouble-conversion" \ + UJSON_BUILD_NO_STRIP=1 $(eval $(python-package))