Skip to content

Commit

Permalink
GH-35503: [CI][Packaging][C++] Snappy patch fails to apply on arm64 w…
Browse files Browse the repository at this point in the history
…indows wheel builds (#35509)

### Rationale for this change

Nightly Windows wheels have been failing for the last days.

### What changes are included in this PR?

Fix wrong snappy patch

### Are these changes tested?

Tested on crossbow

### Are there any user-facing changes?

No
* Closes: #35503

Authored-by: Raúl Cumplido <[email protected]>
Signed-off-by: Jacob Wujciak-Jens <[email protected]>
  • Loading branch information
raulcd authored May 10, 2023
1 parent df5f67d commit 3948c42
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ci/vcpkg/ports.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ index 5a14562..924b1b7 100644
vcpkg_cmake_install()
vcpkg_copy_pdbs()
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index df95a08..d740ce7 100644
index 8f3f3f9..745b0fb 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
Expand All @@ -28,7 +28,7 @@ index df95a08..d740ce7 100644
vcpkg_cmake_configure(
diff --git a/ports/snappy/snappy-disable-bmi.patch b/ports/snappy/snappy-disable-bmi.patch
new file mode 100644
index 0000000000..a57ce0c22f
index 0000000..a57ce0c
--- /dev/null
+++ b/ports/snappy/snappy-disable-bmi.patch
@@ -0,0 +1,19 @@
Expand All @@ -49,5 +49,5 @@ index 0000000000..a57ce0c22f
+ return v & ~(mask << (8 * n));
+-#endif
+ }
+
+
+ static inline bool LeftShiftOverflows(uint8_t value, uint32_t shift) {

0 comments on commit 3948c42

Please sign in to comment.