[curl] Fix android API < 24 (microsoft#36156)

PurpleFlowerGarden · Jan 16, 2024 · c268e9f · c268e9f
1 parent 02e210e
commit c268e9f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/ports/curl/cmake-project-include.cmake b/ports/curl/cmake-project-include.cmake
@@ -1,3 +1,8 @@
+if(ANDROID AND ANDROID_NATIVE_API_LEVEL LESS 24)
+    # https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md
+    set(HAVE_FILE_OFFSET_BITS FALSE CACHE INTERNAL "")
+endif()
+
 # Process the libs and targets in the variable named by `input`
 # into a flat list of libs in the variable named by `output`.
 # Simplify -framework elements.

diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "curl",
   "version": "8.5.0",
+  "port-version": 1,
   "description": "A library for transferring data with URLs",
   "homepage": "https://curl.se/",
   "license": "curl AND ISC AND BSD-3-Clause",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2038,7 +2038,7 @@
     },
     "curl": {
       "baseline": "8.5.0",
-      "port-version": 0
+      "port-version": 1
     },
     "curlpp": {
       "baseline": "2018-06-15",

diff --git a/versions/c-/curl.json b/versions/c-/curl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7b2bf8e8f4e0c7d000cb3b3311f4b9f185cb2d52",
+      "version": "8.5.0",
+      "port-version": 1
+    },
     {
       "git-tree": "b30c6697e314cdba601dee9bdef0ed01e1d09c8f",
       "version": "8.5.0",