Merge pull request #360 from Chia-Network/EL.0.2.13-update

Address issues with windows AMD K10 architecture - Build with clang for portable SHA256
Chia-Network · Jan 3, 2024 · 4e85e52 · 4e85e52
2 parents 691794c + 4998ea9
commit 4e85e52
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -176,6 +176,9 @@ jobs:
 
     - name: Build Windows with maturin on Python ${{ matrix.python }}
       if: matrix.os.matrix == 'windows'
+      env:
+        CC: 'clang'
+        CFLAGS: "-D__BLST_PORTABLE__"
       run: |
         py -${{ matrix.python.major-dot-minor }} -m venv venv
         . .\venv\Scripts\Activate.ps1

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -59,3 +59,6 @@ crate-type = ["rlib"]
 
 [profile.release]
 lto = "thin"
+
+[patch.crates-io]
+blst = { git = "https://github.com/supranational/blst.git", rev = "0d46eefa45fc1e57aceb42bba0e84eab3a7a9725" }
diff --git a/chia-bls/Cargo.toml b/chia-bls/Cargo.toml
@@ -19,7 +19,7 @@ anyhow = "1.0.71"
 # the newer sha2 crate doesn't implement the digest traits required by hkdf
 sha2 = "0.9.9"
 hkdf = "0.11.0"
-blst = { version = "0.3.11", features = ["portable"] }
+blst = { version = "0.3.11", git = "https://github.com/supranational/blst.git", rev = "0d46eefa45fc1e57aceb42bba0e84eab3a7a9725", features = ["portable"] }
 clvmr = "=0.3.0"
 hex = "0.4.3"
 thiserror = "1.0.44"

diff --git a/wheel/Cargo.toml b/wheel/Cargo.toml
@@ -24,3 +24,6 @@ chia-protocol = { version = "=0.2.13", path = "../chia-protocol", features = ["p
 chia-traits = { version = "=0.2.13", path = "../chia-traits", features = ["py-bindings"]  }
 chia_py_streamable_macro = { version = "=0.2.13", path = "../chia_py_streamable_macro" }
 chia_streamable_macro = { version = "=0.2.12", path = "../chia_streamable_macro" }
+
+[patch.crates-io]
+blst = { git = "https://github.com/supranational/blst.git", rev = "0d46eefa45fc1e57aceb42bba0e84eab3a7a9725" }