From 86973e622d23e9ab8194721754186881b88e6d32 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 31 Aug 2025 15:06:59 +0800 Subject: [PATCH] sort config --- config/lib.json | 8 ++-- config/pkg.json | 98 +++++++++++++++++++++++----------------------- config/source.json | 18 ++++----- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/config/lib.json b/config/lib.json index 6d414b9f..81e7ef3c 100644 --- a/config/lib.json +++ b/config/lib.json @@ -19,6 +19,10 @@ "watcher" ] }, + "micro": { + "type": "target", + "source": "micro" + }, "pkg-config": { "type": "package", "source": "pkg-config", @@ -26,10 +30,6 @@ "pkg-config" ] }, - "micro": { - "type": "target", - "source": "micro" - }, "attr": { "source": "attr", "static-libs-unix": [ diff --git a/config/pkg.json b/config/pkg.json index 942b1dbd..00e83595 100644 --- a/config/pkg.json +++ b/config/pkg.json @@ -1,4 +1,16 @@ { + "go-xcaddy-aarch64-linux": { + "type": "custom" + }, + "go-xcaddy-aarch64-macos": { + "type": "custom" + }, + "go-xcaddy-x86_64-linux": { + "type": "custom" + }, + "go-xcaddy-x86_64-macos": { + "type": "custom" + }, "musl-toolchain-aarch64-linux": { "type": "url", "url": "https://dl.static-php.dev/static-php-cli/deps/musl-toolchain/aarch64-musl-toolchain.tgz" @@ -15,6 +27,38 @@ "nasm-2.16.01/ndisasm.exe": "{php_sdk_path}/bin/ndisasm.exe" } }, + "pkg-config-aarch64-linux": { + "type": "ghrel", + "repo": "static-php/static-php-cli-hosted", + "match": "pkg-config-aarch64-linux-musl-1.2.5.txz", + "extract-files": { + "bin/pkg-config": "{pkg_root_path}/bin/pkg-config" + } + }, + "pkg-config-aarch64-macos": { + "type": "ghrel", + "repo": "static-php/static-php-cli-hosted", + "match": "pkg-config-aarch64-darwin.txz", + "extract-files": { + "bin/pkg-config": "{pkg_root_path}/bin/pkg-config" + } + }, + "pkg-config-x86_64-linux": { + "type": "ghrel", + "repo": "static-php/static-php-cli-hosted", + "match": "pkg-config-x86_64-linux-musl-1.2.5.txz", + "extract-files": { + "bin/pkg-config": "{pkg_root_path}/bin/pkg-config" + } + }, + "pkg-config-x86_64-macos": { + "type": "ghrel", + "repo": "static-php/static-php-cli-hosted", + "match": "pkg-config-x86_64-darwin.txz", + "extract-files": { + "bin/pkg-config": "{pkg_root_path}/bin/pkg-config" + } + }, "strawberry-perl-x86_64-win": { "type": "url", "url": "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip" @@ -43,63 +87,19 @@ "upx-*-win64/upx.exe": "{pkg_root_path}/bin/upx.exe" } }, - "go-xcaddy-x86_64-linux": { - "type": "custom" - }, - "go-xcaddy-aarch64-linux": { - "type": "custom" - }, - "go-xcaddy-x86_64-macos": { - "type": "custom" - }, - "go-xcaddy-aarch64-macos": { - "type": "custom" - }, - "zig-x86_64-linux": { - "type": "custom" - }, "zig-aarch64-linux": { "type": "custom" }, - "zig-x86_64-macos": { - "type": "custom" - }, "zig-aarch64-macos": { "type": "custom" }, - "zig-x86_64-win": { + "zig-x86_64-linux": { "type": "custom" }, - "pkg-config-x86_64-linux": { - "type": "ghrel", - "repo": "static-php/static-php-cli-hosted", - "match": "pkg-config-x86_64-linux-musl-1.2.5.txz", - "extract-files": { - "bin/pkg-config": "{pkg_root_path}/bin/pkg-config" - } + "zig-x86_64-macos": { + "type": "custom" }, - "pkg-config-aarch64-linux": { - "type": "ghrel", - "repo": "static-php/static-php-cli-hosted", - "match": "pkg-config-aarch64-linux-musl-1.2.5.txz", - "extract-files": { - "bin/pkg-config": "{pkg_root_path}/bin/pkg-config" - } - }, - "pkg-config-x86_64-macos": { - "type": "ghrel", - "repo": "static-php/static-php-cli-hosted", - "match": "pkg-config-x86_64-darwin.txz", - "extract-files": { - "bin/pkg-config": "{pkg_root_path}/bin/pkg-config" - } - }, - "pkg-config-aarch64-macos": { - "type": "ghrel", - "repo": "static-php/static-php-cli-hosted", - "match": "pkg-config-aarch64-darwin.txz", - "extract-files": { - "bin/pkg-config": "{pkg_root_path}/bin/pkg-config" - } + "zig-x86_64-win": { + "type": "custom" } } diff --git a/config/source.json b/config/source.json index 565d95fd..79e4b153 100644 --- a/config/source.json +++ b/config/source.json @@ -7,15 +7,6 @@ }, "alt": false }, - "pkg-config": { - "type": "url", - "url": "https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz", - "provide-pre-built": true, - "license": { - "type": "file", - "path": "COPYING" - } - }, "amqp": { "type": "url", "url": "https://pecl.php.net/get/amqp", @@ -877,6 +868,15 @@ "path": "LICENSE" } }, + "pkg-config": { + "type": "url", + "url": "https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz", + "provide-pre-built": true, + "license": { + "type": "file", + "path": "COPYING" + } + }, "postgresql": { "type": "ghtagtar", "repo": "postgres/postgres",