Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Aug 2022 15:30:18 GMT
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 4befea1c30c8 - 2022Q3 - archivers/py-borgbackup: avoid dependency on xxhash port
Message-ID:  <202208131530.27DFUIQA087058@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2022Q3 has been updated by pi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4befea1c30c8c318adb1582f58bb54e8ae2c3772

commit 4befea1c30c8c318adb1582f58bb54e8ae2c3772
Author:     Jose G. Juanino <jjuanino@gmail.com>
AuthorDate: 2022-08-13 15:23:51 +0000
Commit:     Kurt Jaeger <pi@FreeBSD.org>
CommitDate: 2022-08-13 15:30:05 +0000

    archivers/py-borgbackup: avoid dependency on xxhash port
    
    - Instead, use the xxhash library provided in the same port
    
    PR:     265060
    Author: Jose G. Juanino <jjuanino@gmail.com>
    (cherry picked from commit 9db903a89b3d1d7c0be2a56059542f3fdb412908)
---
 archivers/py-borgbackup/Makefile             |  3 +--
 archivers/py-borgbackup/files/patch-setup.py | 11 +++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile
index 3b80068b12bb..512b2292a8b6 100644
--- a/archivers/py-borgbackup/Makefile
+++ b/archivers/py-borgbackup/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR}
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
-		libzstd.so:archivers/zstd \
-		libxxhash.so:devel/xxhash
+		libzstd.so:archivers/zstd
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=19.0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		python:3.5+ ssl
diff --git a/archivers/py-borgbackup/files/patch-setup.py b/archivers/py-borgbackup/files/patch-setup.py
new file mode 100644
index 000000000000..399dc0b58daa
--- /dev/null
+++ b/archivers/py-borgbackup/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2022-07-16 16:20:52 UTC
++++ setup.py
+@@ -23,7 +23,7 @@ prefer_system_libzstd = True
+ prefer_system_libb2 = True
+ 
+ # True: use the shared libxxhash (>= 0.6.5 [>= 0.7.2 on ARM]) from the system, False: use the bundled xxhash code
+-prefer_system_libxxhash = True
++prefer_system_libxxhash = False
+ 
+ # prefer_system_msgpack is another option, but you need to set it in src/borg/helpers.py.
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208131530.27DFUIQA087058>