[mixed] refactor with putenv, fix imagemagick and c++ build

2026-07-06 16:25:39 +08:00 · 2023-10-23 00:37:28 +08:00
parent 5934e5e881
commit c84eb723ec
52 changed files with 205 additions and 168 deletions
--- a/config/ext.json
+++ b/config/ext.json
@@ -146,7 +146,6 @@
    },
    "intl": {
        "type": "builtin",
-        "cpp-extension": true,
        "lib-depends": [
            "icu"
        ]
--- a/config/lib.json
+++ b/config/lib.json
@@ -111,6 +111,7 @@
    },
    "icu": {
        "source": "icu",
+        "cpp-library": true,
        "static-libs-unix": [
            "libicui18n.a",
            "libicuio.a",
@@ -129,13 +130,13 @@
            "zlib",
            "libpng",
            "libjpeg",
-            "bzip2",
            "libwebp",
            "freetype"
        ],
        "lib-suggests": [
            "zstd",
            "xz",
+            "bzip2",
            "libzip",
            "libxml2"
        ]