From 1250f8c2e8613c45d5d3f6885672f75f9c29ce63 Mon Sep 17 00:00:00 2001 From: Alex Chapman Date: Mon, 29 Jul 2024 18:03:10 -0700 Subject: [PATCH 1/5] Add small comment in mac documentation --- src/docs/sphinx/quickstart.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/sphinx/quickstart.rst b/src/docs/sphinx/quickstart.rst index 9617a8b6d..fc506a5cf 100644 --- a/src/docs/sphinx/quickstart.rst +++ b/src/docs/sphinx/quickstart.rst @@ -290,7 +290,7 @@ If you plan to install the developer tools, you should also run $ brew install cppcheck doxygen llvm@14 $ ln -s /opt/homebrew/opt/llvm@14/bin/clang-format /opt/homebrew/bin/clang-format -If you have installed Homebrew using the default installation prefix, most packages will be accessible through the prefix ``/opt/homebrew``. +If you have installed Homebrew using the default installation prefix, most packages will be accessible through the prefix ``/opt/homebrew`` (or ``/usr/local`` if you're using an Intel Mac) Some packages are not linked into this prefix to prevent conflicts with MacOS-provided versions. These will only be accessible via the prefix ``/opt/homebrew/opt/[package-name]``. Homebrew will warn about such packages after installing them. From 61028a8ad32239cda25addc0dfd01d92d2060406 Mon Sep 17 00:00:00 2001 From: Alex Chapman Date: Mon, 29 Jul 2024 18:06:53 -0700 Subject: [PATCH 2/5] period --- src/docs/sphinx/quickstart.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/sphinx/quickstart.rst b/src/docs/sphinx/quickstart.rst index fc506a5cf..c0802bbc3 100644 --- a/src/docs/sphinx/quickstart.rst +++ b/src/docs/sphinx/quickstart.rst @@ -290,7 +290,7 @@ If you plan to install the developer tools, you should also run $ brew install cppcheck doxygen llvm@14 $ ln -s /opt/homebrew/opt/llvm@14/bin/clang-format /opt/homebrew/bin/clang-format -If you have installed Homebrew using the default installation prefix, most packages will be accessible through the prefix ``/opt/homebrew`` (or ``/usr/local`` if you're using an Intel Mac) +If you have installed Homebrew using the default installation prefix, most packages will be accessible through the prefix ``/opt/homebrew`` (or ``/usr/local`` if you're using an Intel Mac). Some packages are not linked into this prefix to prevent conflicts with MacOS-provided versions. These will only be accessible via the prefix ``/opt/homebrew/opt/[package-name]``. Homebrew will warn about such packages after installing them. From 7bbacab3ed1f10227cff74116158f5ed1f50a5cc Mon Sep 17 00:00:00 2001 From: Alex Chapman Date: Mon, 29 Jul 2024 18:09:19 -0700 Subject: [PATCH 3/5] improve wording --- src/docs/sphinx/quickstart.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/docs/sphinx/quickstart.rst b/src/docs/sphinx/quickstart.rst index c0802bbc3..18f785b05 100644 --- a/src/docs/sphinx/quickstart.rst +++ b/src/docs/sphinx/quickstart.rst @@ -290,7 +290,8 @@ If you plan to install the developer tools, you should also run $ brew install cppcheck doxygen llvm@14 $ ln -s /opt/homebrew/opt/llvm@14/bin/clang-format /opt/homebrew/bin/clang-format -If you have installed Homebrew using the default installation prefix, most packages will be accessible through the prefix ``/opt/homebrew`` (or ``/usr/local`` if you're using an Intel Mac). +If you have installed Homebrew using the default installation prefix, most packages will be accessible through the prefix ``/opt/homebrew``. +Note for Intel-based Macs, the installation prefix is ``/usr/local``. For the rest of this section however, we will assume the prefix is ``/opt/homebrew``. Some packages are not linked into this prefix to prevent conflicts with MacOS-provided versions. These will only be accessible via the prefix ``/opt/homebrew/opt/[package-name]``. Homebrew will warn about such packages after installing them. From fbb77b06e9d25797d52598d75ac5b7aebd19da83 Mon Sep 17 00:00:00 2001 From: Michael Tupek <135926736+tupek2@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:36:48 -0700 Subject: [PATCH 4/5] Update quickstart.rst --- src/docs/sphinx/quickstart.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/sphinx/quickstart.rst b/src/docs/sphinx/quickstart.rst index 18f785b05..c5e1f3a45 100644 --- a/src/docs/sphinx/quickstart.rst +++ b/src/docs/sphinx/quickstart.rst @@ -315,7 +315,7 @@ The versions for all installed packages can be listed via: Note that the version format output by the above command is not the same as that expected by Spack, so be sure to add an ``@`` symbol between the package name and version string. -If you are not using an M2 or M3 Mac, you will need to change the ``target`` for the compiler to ``x86_64`` or ``m1`` for Intel and M1-based Macs, respectively. +If you are not using an M2 or M3 Mac, you will need to change the ``target`` for the compiler to ``x86_64`` or ``aarch64`` for Intel and M1-based Macs, respectively. Similarly, you need to set the ``operating_system`` to the proper value if you are not using ``sonoma`` (MacOS 14.X). If you want to install the devtools, you should also add the following under ``packages`` in the ``spack.yaml`` files. From c18dba949c7f44e606f14c8e281fb65bb14a5a83 Mon Sep 17 00:00:00 2001 From: Alex Chapman Date: Tue, 30 Jul 2024 10:07:35 -0700 Subject: [PATCH 5/5] Mention command to query brew prefix --- src/docs/sphinx/quickstart.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/docs/sphinx/quickstart.rst b/src/docs/sphinx/quickstart.rst index 18f785b05..e4f03703e 100644 --- a/src/docs/sphinx/quickstart.rst +++ b/src/docs/sphinx/quickstart.rst @@ -291,7 +291,8 @@ If you plan to install the developer tools, you should also run $ ln -s /opt/homebrew/opt/llvm@14/bin/clang-format /opt/homebrew/bin/clang-format If you have installed Homebrew using the default installation prefix, most packages will be accessible through the prefix ``/opt/homebrew``. -Note for Intel-based Macs, the installation prefix is ``/usr/local``. For the rest of this section however, we will assume the prefix is ``/opt/homebrew``. +Note for Intel-based Macs, the installation prefix is ``/usr/local``. If you set a custom prefix or aren't sure what the prefix is, run ``brew --prefix``. +For the rest of this section, we will assume the prefix is ``/opt/homebrew``. Some packages are not linked into this prefix to prevent conflicts with MacOS-provided versions. These will only be accessible via the prefix ``/opt/homebrew/opt/[package-name]``. Homebrew will warn about such packages after installing them.