fix numpy build error on apple silicon (#11580)

* fix numpy build error on apple silicon * also fix document
project-chip · Aug 10, 2022 · 1250587 · 1250587
1 parent 6e71e75
commit 1250587
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -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/[email protected]/1.1.1g/lib/pkgconfig/* .
@@ -68,6 +70,12 @@ ln -s ../../Cellar/[email protected]/1.1.1g/lib/pkgconfig/* .
 where `[email protected]/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
@@ -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
@@ -42,7 +42,7 @@ protobuf
 anytree
 cxxfilt
 ghapi
-pandas ; platform_machine != 'aarch64'
+pandas ; platform_machine != 'aarch64' and platform_machine != 'arm64'
 
 # scripts/build
 click
-Original file line number
+Diff line change
@@ Expand Up / @@ -435,6 +435,7 @@ hciconfig @@
     hdlc
     HKDF
     hoc
+    homebrew
     hostapd
     hostname
     href
@@ Expand Down @@