From fe39aecd72c05099b157ba5c04eed8f02bafb284 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sat, 23 Sep 2023 14:09:51 +0800 Subject: [PATCH] adjust config order --- config/ext.json | 8 ++++---- config/lib.json | 5 +++++ config/source.json | 18 +++++++++--------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/config/ext.json b/config/ext.json index 2914007f..359533a9 100644 --- a/config/ext.json +++ b/config/ext.json @@ -158,14 +158,11 @@ "ldap" ], "lib-suggests": [ - "openssl", - "zlib", "gmp", "libsodium" ], "ext-suggests": [ - "openssl", - "zlib" + "openssl" ] }, "mbregex": { @@ -239,6 +236,9 @@ "arg-type": "with", "lib-depends": [ "openssl" + ], + "ext-depends": [ + "zlib" ] }, "pcntl": { diff --git a/config/lib.json b/config/lib.json index bc11d36c..63aa44a4 100644 --- a/config/lib.json +++ b/config/lib.json @@ -144,6 +144,11 @@ "static-libs-unix": [ "liblber.a", "libldap.a" + ], + "lib-suggests": [ + "openssl", + "gmp", + "libsodium" ] }, "libavif": { diff --git a/config/source.json b/config/source.json index d204062e..9859cd33 100644 --- a/config/source.json +++ b/config/source.json @@ -42,15 +42,6 @@ "path": "COPYING" } }, - "ldap": { - "type": "filelist", - "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/", - "regex": "/href=\"(?openldap-(?[^\"]+)\\.tgz)\"/", - "license": { - "type": "file", - "path": "LICENSE" - } - }, "ext-event": { "type": "url", "url": "https://bitbucket.org/osmanov/pecl-event/get/3.0.8.tar.gz", @@ -162,6 +153,15 @@ "path": "LICENSE" } }, + "ldap": { + "type": "filelist", + "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/", + "regex": "/href=\"(?openldap-(?[^\"]+)\\.tgz)\"/", + "license": { + "type": "file", + "path": "LICENSE" + } + }, "libavif": { "type": "ghtar", "repo": "AOMediaCodec/libavif",