From 2cbf1e4d3a1ade7acc41ed50389fba2001680b6e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 24 Jul 2022 02:29:28 -0600 Subject: [PATCH] package/python-orjson: convert to use the python-package infrastructure Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-orjson/python-orjson.mk | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index cfcaedc280..3a0ab937d4 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -6,17 +6,16 @@ PYTHON_ORJSON_VERSION = 3.6.8 PYTHON_ORJSON_SITE = $(call github,ijl,orjson,$(PYTHON_ORJSON_VERSION)) +PYTHON_ORJSON_SETUP_TYPE = pep517 PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -PYTHON_ORJSON_DEPENDENCIES = host-python-cffi -PYTHON_ORJSON_CARGO_ENV = \ +PYTHON_ORJSON_DEPENDENCIES = host-python-cffi host-python-maturin +PYTHON_ORJSON_ENV = \ + $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +# We need to vendor the Cargo crates at download time +PYTHON_ORJSON_DOWNLOAD_POST_PROCESS = cargo +PYTHON_ORJSON_DOWNLOAD_DEPENDENCIES = host-rustc +PYTHON_ORJSON_DL_ENV = $(PKG_CARGO_ENV) -# orjson uses "maturin" to generate distribution packages - rather than teach -# buildroot how to understand this, we reach in and install directly. -define PYTHON_ORJSON_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/target/$(RUSTC_TARGET_NAME)/release/liborjson.so \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/orjson.so -endef - -$(eval $(cargo-package)) +$(eval $(python-package))