Update platform-specific options for libcurl

StanzaOrg · Mar 22, 2024 · 792caa8 · 792caa8
1 parent 9979b8b
commit 792caa8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/bootstrap.py b/bootstrap.py
@@ -28,7 +28,6 @@ def eprint(msg):
         "term-colors":              { "git": "StanzaOrg/term-colors",           "version": "0.1.1" },
         "libcurl": { "pkg": "libcurl", "type": "conan", "version": "8.6.0",
             "options": {
-                "fPIC": "True",
                 "shared": "False",
                 "with_brotli": "False",
                 "with_c_ares": "False",
@@ -72,13 +71,14 @@ def eprint(msg):
                 "with_zlib": "True",
                 "with_zstd": "False",
                 "linux": {
+                    "fPIC": "True",
                     "with_ssl": "openssl"
                 },
                 "macos": {
+                    "fPIC": "True",
                     "with_ssl": "darwinssl"
                 },
                 "windows": {
-                    "fPIC": "False",
                     "with_ssl": "schannel",
                     "with_unix_sockets": "False"
                 }

diff --git a/slm.toml b/slm.toml
@@ -18,7 +18,6 @@ term-colors =              { git = "StanzaOrg/term-colors",           version =
 pkg="libcurl"
 version="8.6.0"
 type="conan"
-options.fPIC = "True"
 options.shared = "False"
 options.with_brotli = "False"
 options.with_c_ares = "False"
@@ -61,8 +60,9 @@ options.with_verbose_debug = "True"
 options.with_verbose_strings = "True"
 options.with_zlib = "True"
 options.with_zstd = "False"
+options.linux.fPIC = "True"
 options.linux.with_ssl = "openssl"
+options.macos.fPIC = "True"
 options.macos.with_ssl = "darwinssl"
-options.windows.fPIC = "False"
 options.windows.with_ssl = "schannel"
 options.windows.with_unix_sockets = "False"
diff --git a/src/conan-utils.stanza b/src/conan-utils.stanza
@@ -251,14 +251,14 @@ public defn conan-fully-qualify-latest-version (cv:ConanVersion, -- options:Toml
         ; Look for platform-specific options (if any) and apply them to the
         ; requested options hashtable, overrding existing values.  Ignore other platforms.
         debug("conan-fully-qualify-latest-version: looking for platform-specific options")
-        match(get-table?(options, lower-case(current_conan_os))):
+        match(get-table?(options, current_conan_os_lc)):
           (osopts:One<TomlTable>):
             debug("conan-fully-qualify-latest-version: found platform-specific options: \"%_\"" % [to-string(entries(value(osopts)))])
             for o in entries(value(osopts)) do:
               debug("conan-fully-qualify-latest-version: platform-specific option \"%_\" = \"%_\"" % [key(o), value(o)])
               set(htro, to-string(key(o)), to-string(value(o)))
           (_):
-            debug("conan-fully-qualify-latest-version: no platform-specific options found")
+            debug("conan-fully-qualify-latest-version: no platform-specific options found for platform \"%_\"" % [current_conan_os_lc])
             false
 
         ; search for available recipe revisions using just the name and version