From 21c6bcf207df4c47f3f3f502b039a75dc4e9872e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 6 Dec 2023 10:56:43 -0800 Subject: [PATCH 1/2] README.md: Update section on macOS arm64 --- README.md | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 495365af6eb..af75e0d411e 100644 --- a/README.md +++ b/README.md @@ -90,26 +90,13 @@ below](#sagemath-docker-images)) or other virtualization solutions. [macOS] Preparing the Platform ------------------------------ -If your Mac uses the Apple Silicon (M1, M2, arm64) architecture: - -- If you set up your Mac by transferring files from an older Mac, make sure +- If your Mac uses the Apple Silicon (M1, M2, M3; arm64) architecture and + you set up your Mac by transferring files from an older Mac, make sure that the directory ``/usr/local`` does not contain an old copy of Homebrew (or other software) for the x86_64 architecture that you may have copied over. Note that Homebrew for the M1 is installed in ``/opt/homebrew``, not ``/usr/local``. -- If you wish to use conda, please see the [section on - conda](https://doc.sagemath.org/html/en/installation/conda.html) in the Sage - Installation Manual for guidance. - -- Otherwise, using Homebrew ("the missing package manager for macOS") from - https://brew.sh/ required because it provides a version of ``gfortran`` with - necessary changes for this platform that are not in a released upstream - version of GCC. (The ``gfortran`` package that comes with the Sage - distribution is not suitable for the M1/M2.) - -If your Mac uses the Intel (x86_64) architecture: - - If you wish to use conda, please see the [section on conda](https://doc.sagemath.org/html/en/installation/conda.html) in the Sage Installation Manual for guidance. From e903fcebea340a7c2871458e8575b32a73fb9eac Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Thu, 7 Dec 2023 12:26:19 +0000 Subject: [PATCH 2/2] fixed mismatch between TOC and actual titles --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index af75e0d411e..06823a025e4 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,8 @@ Table of Contents * [Getting Started](#getting-started) * [Supported Platforms](#supported-platforms) -* [\[Windows\] Preparing the Platform Libraries](#windows-preparing-the-platform) -* [\[macOS\] Preparing the Platform Libraries](#macos-preparing-the-platform) +* [\[Windows\] Preparing the Platform](#windows-preparing-the-platform) +* [\[macOS\] Preparing the Platform](#macos-preparing-the-platform) * [Instructions to Build from Source](#instructions-to-build-from-source) * [SageMath Docker Images](#sagemath-docker-images) * [Troubleshooting](#troubleshooting)