From 6649314a0326477877e2691b181b192e19cee959 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 1 Mar 2023 14:09:43 +0800 Subject: [PATCH] borgbackup: Add missing build dependencies setuptools-scm is a declared build dependency[1], and pkgconfig will allow setup to find the required libraries, replacing the need to set environment variables. [1]: https://github.com/borgbackup/borg/blob/1.2.4/setup.py#L313 Signed-off-by: Jeffery To --- lang/python/borgbackup/Makefile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/lang/python/borgbackup/Makefile b/lang/python/borgbackup/Makefile index a8629deef..95fd7eaff 100644 --- a/lang/python/borgbackup/Makefile +++ b/lang/python/borgbackup/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=borgbackup PKG_VERSION:=1.2.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PYPI_NAME:=borgbackup PKG_HASH:=a4bd54e9469e81b7a30a6711423115abc818d9cd844ecb1ca0e6104bc5374da8 @@ -57,16 +57,7 @@ define Package/borgbackup/description The data deduplication technique used makes Borg suitable for daily backups since only changes are stored. The authenticated encryption technique makes it suitable for backups to not fully trusted targets. endef -PKG_BUILD_DEPENDS:=python-cython/host - -# borg setup.py shall find these via pkg-config, but depends on python pkgconfig PyPi module -# which quickly becomes a nightmare to build, since it build-depends on poetry which is not -# available in the python package feed, and has a myriad of deps -PYTHON3_PKG_SETUP_VARS:= \ - BORG_OPENSSL_PREFIX="/usr/lib" \ - BORG_LIBLZ4_PREFIX="/usr/lib" \ - BORG_LIBZSTD_PREFIX="/usr/lib" \ - BORG_LIBXXHASH_PREFIX="/usr/lib" +PKG_BUILD_DEPENDS:=python-cython/host python-pkgconfig/host python-setuptools-scm/host $(eval $(call Py3Package,borgbackup)) $(eval $(call BuildPackage,borgbackup))