diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt index 391e7bde76f92b..6cac33b9ab1f99 100644 --- a/.github/.wordlist.txt +++ b/.github/.wordlist.txt @@ -435,6 +435,7 @@ hciconfig hdlc HKDF hoc +homebrew hostapd hostname href diff --git a/docs/guides/BUILDING.md b/docs/guides/BUILDING.md index 1d8a4c2b602b65..5a76a187e39fd2 100644 --- a/docs/guides/BUILDING.md +++ b/docs/guides/BUILDING.md @@ -60,6 +60,8 @@ brew install openssl pkg-config However, that does not expose the package to `pkg-config`. To fix that, one needs to run something like the following: +Intel: + ``` cd /usr/local/lib/pkgconfig ln -s ../../Cellar/openssl@1.1/1.1.1g/lib/pkgconfig/* . @@ -68,6 +70,12 @@ ln -s ../../Cellar/openssl@1.1/1.1.1g/lib/pkgconfig/* . where `openssl@1.1/1.1.1g` may need to be replaced with the actual version of OpenSSL installed by Brew. +Apple Silicon: + +``` +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"/opt/homebrew/opt/openssl@3/lib/pkgconfig" +``` + Note: If using MacPorts, `port install openssl` is sufficient to satisfy this dependency. diff --git a/scripts/constraints.txt b/scripts/constraints.txt index 1309fd92849ce8..ed8c52b36fa478 100644 --- a/scripts/constraints.txt +++ b/scripts/constraints.txt @@ -113,7 +113,7 @@ numpy==1.20.3 # via pandas packaging==20.9 # via west -pandas==1.2.4 ; platform_machine != "aarch64" +pandas==1.2.4 ; platform_machine != "aarch64" and platform_machine != "arm64" # via -r requirements.txt parso==0.8.2 # via jedi diff --git a/scripts/requirements.txt b/scripts/requirements.txt index 7905aff72b6862..f68b124bb7d6f7 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -42,7 +42,7 @@ protobuf anytree cxxfilt ghapi -pandas ; platform_machine != 'aarch64' +pandas ; platform_machine != 'aarch64' and platform_machine != 'arm64' # scripts/build click