From nobody Sat Aug 13 15:30:18 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4ky22Z3Bz4Z4Y9; Sat, 13 Aug 2022 15:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4ky225Y7z485W; Sat, 13 Aug 2022 15:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660404618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDGWt735TgZ9TJgsgBnBsR8ARAoszAU/APCfwOBb8eM=; b=QtEusVSLGFW3bDuTW8yyVcFQt3FjqPMt/kxix0aFsRXzJ8wxI8H2SP9dIhBwQaheqSxXkz 9cWXfLkxzSrNnkZsGAe7QW+tjmVEmdlQhZoHNxiXVkzy76xrfE2DqQ4kwR38nHZItcAbHa Va+uzXhm44CTui0KyXFDHypQ15LT5tBvLmfGbDf7cDFCrxhJgeROzOIgZIlDU1/gxo/j50 2H5n4LlunO3C0YtjjnDsqtPMHPinD4Z3HeMzah0035Kx6DTf1TkJZsGm7PcgiCjmzyVXAD vI/wT/e97Epii2xCLQXvh9i5zsy+16dw5RVub77xVkjHbO06kAUYuocVs09pXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M4ky218PmzG15; Sat, 13 Aug 2022 15:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27DFUIFa087064; Sat, 13 Aug 2022 15:30:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27DFUIQA087058; Sat, 13 Aug 2022 15:30:18 GMT (envelope-from git) Date: Sat, 13 Aug 2022 15:30:18 GMT Message-Id: <202208131530.27DFUIQA087058@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kurt Jaeger Subject: git: 4befea1c30c8 - 2022Q3 - archivers/py-borgbackup: avoid dependency on xxhash port List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 4befea1c30c8c318adb1582f58bb54e8ae2c3772 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660404618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDGWt735TgZ9TJgsgBnBsR8ARAoszAU/APCfwOBb8eM=; b=m6QmlQSyRcyRimCq0DN4l1Hagc66msXgmiBhETZfAkEXBLV5kr8fnw6WAToM8EI+++1zAk Kv3eGdiaOfVLWHpDbmc3KvSlI+8UWhOYESjUbUGO9Os01nGlb9i6twPEtx7KXs8I6ZmHor /LfMO84ry0g3ckMeeIo21vvI+eavYfkmUY4eWriWlQVyYYHNNyCxB5cG58CqAbAJYGjbim 46reHvyrFaaQ2GJEpU8ZK/fWYxBO5W01MsMisS5meiGkuB+YKk6oQPTrcEoDSfajpHliEz lW9psrLs4fChqtZQ5WJvBmW5oMoUjnn927ZOrE74sChauhQz1+kp8BFna0EgbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660404618; a=rsa-sha256; cv=none; b=uEV/2a4/iSN1IJ4Mj1FSj1rxyS6MgbPJi/NQu8eS+D3h6v3crjshfraNgzSxc2GlzSouHN CBjKp+Gub9JJmTTElqr+9a2HBFLL5JP0wf8wAORz2ej9eeCrXiHKByLJKu7KiGLNZvYF/S 3uMLHj2rU6WvjRWEedNkR3XftWGF4n1EtqstXWR2H/uXmer6a1HCKmN+s5Q6IhUeBvSdVr Pm4+5N3HvClC6yWD5qTyuSl2wjJaT9UDVdP36/U6re+jMvWmZwPXHr1sBIui9AT+0iZ/Op 8x+lJM0XSWqYSy/InW359PA6Y2uQ5PItR4pFdya3lTTqEK9FWs9L3fgxPM6HQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=4befea1c30c8c318adb1582f58bb54e8ae2c3772 commit 4befea1c30c8c318adb1582f58bb54e8ae2c3772 Author: Jose G. Juanino AuthorDate: 2022-08-13 15:23:51 +0000 Commit: Kurt Jaeger 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 (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. +