Bläddra i källkod

Merge pull request #5705 from m3nu/issue/5660/macfuse-m1

Apple M1 compatibility
TW 4 år sedan
förälder
incheckning
6daa62f450
2 ändrade filer med 3 tillägg och 3 borttagningar
  1. 2 2
      docs/installation.rst
  2. 1 1
      setup.py

+ 2 - 2
docs/installation.rst

@@ -50,7 +50,7 @@ Fedora/RHEL  `Fedora official repository`_                 ``dnf install borgbac
 FreeBSD      `FreeBSD ports`_                              ``cd /usr/ports/archivers/py-borgbackup && make install clean``
 FreeBSD      `FreeBSD ports`_                              ``cd /usr/ports/archivers/py-borgbackup && make install clean``
 macOS        `Homebrew`_                                   | ``brew install borgbackup`` (official formula, **no** FUSE support)
 macOS        `Homebrew`_                                   | ``brew install borgbackup`` (official formula, **no** FUSE support)
                                                            | **or**
                                                            | **or**
-                                                           | ``brew install --cask osxfuse`` (`private Tap`_, FUSE support) 
+                                                           | ``brew install --cask macfuse`` (`private Tap`_, FUSE support) 
                                                            | ``brew install borgbackup/tap/borgbackup-fuse``
                                                            | ``brew install borgbackup/tap/borgbackup-fuse``
 Mageia       `cauldron`_                                   ``urpmi borgbackup``
 Mageia       `cauldron`_                                   ``urpmi borgbackup``
 NetBSD       `pkgsrc`_                                     ``pkg_add py-borgbackup``
 NetBSD       `pkgsrc`_                                     ``pkg_add py-borgbackup``
@@ -243,7 +243,7 @@ For FUSE support to mount the backup archives, you need at least version 3.0 of
 macFUSE, which is available via `Github
 macFUSE, which is available via `Github
 <https://github.com/osxfuse/osxfuse/releases/latest>`__, or Homebrew::
 <https://github.com/osxfuse/osxfuse/releases/latest>`__, or Homebrew::
 
 
-    brew install --cask osxfuse
+    brew install --cask macfuse
 
 
 For OS X Catalina and later, be aware that you must authorize full disk access.
 For OS X Catalina and later, be aware that you must authorize full disk access.
 It is no longer sufficient to run borg backups as root. If you have not yet
 It is no longer sufficient to run borg backups as root. If you have not yet

+ 1 - 1
setup.py

@@ -168,7 +168,7 @@ library_dirs = []
 define_macros = []
 define_macros = []
 
 
 possible_openssl_prefixes = ['/usr', '/usr/local', '/usr/local/opt/openssl', '/usr/local/ssl', '/usr/local/openssl',
 possible_openssl_prefixes = ['/usr', '/usr/local', '/usr/local/opt/openssl', '/usr/local/ssl', '/usr/local/openssl',
-                             '/usr/local/borg', '/opt/local', '/opt/pkg', ]
+                             '/usr/local/borg', '/opt/local', '/opt/pkg', '/opt/homebrew/opt/openssl@1.1', ]
 if os.environ.get('BORG_OPENSSL_PREFIX'):
 if os.environ.get('BORG_OPENSSL_PREFIX'):
     possible_openssl_prefixes.insert(0, os.environ.get('BORG_OPENSSL_PREFIX'))
     possible_openssl_prefixes.insert(0, os.environ.get('BORG_OPENSSL_PREFIX'))
 ssl_prefix = detect_openssl(possible_openssl_prefixes)
 ssl_prefix = detect_openssl(possible_openssl_prefixes)