snappy: fix build under android ndk r27.

xmake-io · Jan 3, 2025 · a67c168 · a67c168
1 parent 97dba76
commit a67c168
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/packages/s/snappy/patches/1.2.1/cmake.patch → ...ches/1.2.1/update-neon-flag-aarch64.patch b/packages/s/snappy/patches/1.2.1/cmake.patch → ...ches/1.2.1/update-neon-flag-aarch64.patch
diff --git a/packages/s/snappy/patches/fix-build-under-android-ndk-r27.patch b/packages/s/snappy/patches/fix-build-under-android-ndk-r27.patch
@@ -0,0 +1,25 @@
+From 3adc68d24e6d9546d871e7e57615a0fb30d92af3 Mon Sep 17 00:00:00 2001
+From: Redbeanw44602 <[email protected]>
+Date: Fri, 3 Jan 2025 12:11:56 +0800
+Subject: [PATCH] fix build under android ndk-r27
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b1d072c..89b5509 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.3)
+ project(Snappy VERSION 1.2.1 LANGUAGES C CXX)
+
+ # C++ standard can be overridden when this is used as a sub-project.
+-- 
+2.47.1
+
diff --git a/packages/s/snappy/xmake.lua b/packages/s/snappy/xmake.lua
@@ -13,7 +13,8 @@ package("snappy")
 
     add_patches("1.1.9", "patches/1.1.9/inline.patch", "ed6b247d19486ab3f08f268269133193d7cdadd779523c5e69b5e653f82d535b")
     add_patches("1.1.10", "patches/1.1.10/cmake.patch", "d4883111dcfab81ea35ac1e4e157e55105cec02a0ba804458405be25cbf7b6bb")
-    add_patches(">=1.2.0 <=1.2.1", "patches/1.2.1/cmake.patch", "13100aa56de71a11bb3704bd7507613fd53caa3ab6e7dbec3de74875deb46ba5")
+    add_patches(">=1.2.0 <=1.2.1", "patches/1.2.1/update-neon-flag-aarch64.patch", "13100aa56de71a11bb3704bd7507613fd53caa3ab6e7dbec3de74875deb46ba5")
+    add_patches("*", "patches/fix-build-under-android-ndk-r27.patch", "f3dcfd51072957c68ca9c404fe1f13a773ab76a187eeb2f73c2958c942d80a90")
 
     add_deps("cmake")