From nobody Sat Aug 13 15:26:57 2022 X-Original-To: dev-commits-ports-main@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 4M4kt94473z4Z4Rq; Sat, 13 Aug 2022 15:26:57 +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 4M4kt93YT6z47SK; Sat, 13 Aug 2022 15:26:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660404417; 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=FR9GckFm0bdiwRmrmrdn+5+xHlXzHO+MlhZT7smETbg=; b=N9Wko790Zkvb4iDmmzqkGJ3v9N9wwg12V6wicJJQeqIHSzIiP2wtMiHOXm3IsBoKQFRrxX ZTsRkv0FJNFvye0lrpnWyAnGcenjL6xiytNN2JxKwlu5xIM55TP4hC7x/+76mrI/kpj6ax e+wHfzlzwFhVxGCLRvZMPUCr/k28qlq0r0UNFN+iBGwOtFQkgaqzAauYXWh83AKHo9nTsE 64qwh4OfsSTeZo5KsJzI9CDuFoTnIZiH224ZJ8wQN9Xlh+Ejw/yWqbL+h/I1CV3NASpn+O CHPsgifigvMZTXhAYmi9bM1BEWqdkcvmzpJH6qwH+WiLQIaFqsu8ANIkNWAy6Q== 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 4M4kt92Q2GzGhR; Sat, 13 Aug 2022 15:26:57 +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 27DFQv1C080315; Sat, 13 Aug 2022 15:26:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27DFQvgn080314; Sat, 13 Aug 2022 15:26:57 GMT (envelope-from git) Date: Sat, 13 Aug 2022 15:26:57 GMT Message-Id: <202208131526.27DFQvgn080314@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: 9db903a89b3d - main - archivers/py-borgbackup: avoid dependency on xxhash port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 9db903a89b3d1d7c0be2a56059542f3fdb412908 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660404417; 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=FR9GckFm0bdiwRmrmrdn+5+xHlXzHO+MlhZT7smETbg=; b=feXiihtPAiVVTGji5aAO0Z0PH+/g+zWeV2LtIcQTcc4xNQF+hI8TNa4vDbxiCkTA5SB0hk kDWG2Zc2LYtppg06ccPTObaaEGcRXnJzO7UOwUfSswaiMdvt33ng2rkwGdAcwX4wlt9ZRj cZxy1t/mN7DLDjD5sNYhkMSf5SpTgO0O+Bo7oPr1Pzb8dGqGhqIPVDWzPaK08wwxUDCNJn uiWZmvVfDAfmOxkraGjFWo9dCwOTY/1E9rEWxpG4EM4zGEROgXDthI8ownWL7oIM1LMZ/5 qxXHmGt1b7CMb5dGNDDazbup1xd0+bHPcFoOvheT9OaIWooZyxiRaxLQ+n6gIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660404417; a=rsa-sha256; cv=none; b=rjPCeO3Ru4jNn5VrAnkZ53JXpj1vDKctGxJ7K7xJuWnUmDq6S7YgLSUVfdImiLqS7KtF3l +1ShFtGIrj6Xzm45qILYX5Z352bvkWkCa9ZGCRlq41E4bvTs6xOUpMz74waSj8FbIXVMNI GS/1FwwCxbzzcwFKIY8qKfff909cLbWmhBcKM3Z0BO7s9HZhq3JA8lczl/Yw/Y/9TBYgCB plGuLBlDieOAUvuUhC6TjwQjo28Ldt14ob/8ne2aiKT9/FzMP4f330gNNrj25dzB2wW9n7 5maO4gQl3+V6VryAPnNuXMX2mAP8dliZtavURWecIp61SwjFVQDDgT10xvOghA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=9db903a89b3d1d7c0be2a56059542f3fdb412908 commit 9db903a89b3d1d7c0be2a56059542f3fdb412908 Author: Jose G. Juanino AuthorDate: 2022-08-13 15:23:51 +0000 Commit: Kurt Jaeger CommitDate: 2022-08-13 15:23:51 +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 --- 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 0956f7557e7a..71e4c38ed241 100644 --- a/archivers/py-borgbackup/Makefile +++ b/archivers/py-borgbackup/Makefile @@ -12,8 +12,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. +