Skip to content

Commit 9382161

Browse files
committed
Revert "add gsasl"
This reverts commit a1b8d20.
1 parent a1b8d20 commit 9382161

File tree

6 files changed

+2
-66
lines changed

6 files changed

+2
-66
lines changed

config/lib.json

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@
107107
"ldap",
108108
"krb5",
109109
"idn2",
110-
"psl",
111-
"gsasl"
110+
"psl"
112111
],
113112
"lib-suggests-macos": [
114113
"libssh2",
@@ -905,21 +904,6 @@
905904
"idn2"
906905
]
907906
},
908-
"gsasl": {
909-
"source": "gsasl",
910-
"pkg-configs": [
911-
"libgsasl"
912-
],
913-
"headers": [
914-
"gsasl.h"
915-
],
916-
"lib-depends": [
917-
"idn2"
918-
],
919-
"lib-suggests": [
920-
"krb5"
921-
]
922-
},
923907
"pthreads4w": {
924908
"source": "pthreads4w",
925909
"static-libs-windows": [

config/source.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,16 +1200,6 @@
12001200
"path": "LICENSE"
12011201
}
12021202
},
1203-
"gsasl": {
1204-
"type": "filelist",
1205-
"url": "https://ftp.gnu.org/gnu/gsasl/",
1206-
"regex": "/href=\\\"(?<file>gsasl-(?<version>[^\\\"]+)\\.tar\\.gz)\\\"/",
1207-
"prefer-stable": true,
1208-
"license": {
1209-
"type": "file",
1210-
"path": "COPYING.LESSER"
1211-
}
1212-
},
12131203
"yaml": {
12141204
"type": "git",
12151205
"path": "php-src/ext/yaml",

src/SPC/builder/linux/library/gsasl.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/SPC/builder/unix/library/curl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ protected function build(): void
2424
->optionalLib('idn2', ...cmake_boolean_args('USE_LIBIDN2'))
2525
->optionalLib('psl', ...cmake_boolean_args('CURL_USE_LIBPSL'))
2626
->optionalLib('krb5', ...cmake_boolean_args('CURL_USE_GSSAPI'))
27-
->optionalLib('gsasl', ...cmake_boolean_args('USE_GSASL'))
2827
->optionalLib('idn2', ...cmake_boolean_args('CURL_USE_IDN2'))
2928
->optionalLib('libcares', '-DENABLE_ARES=ON')
3029
->addConfigureArgs(

src/SPC/builder/unix/library/gsasl.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/SPC/builder/unix/library/krb5.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ protected function build(): void
2222
'LDFLAGS' => '-Wl,--allow-multiple-definition',
2323
])
2424
->optionalLib('ldap', '--with-ldap', '--without-ldap')
25-
->optionalLib('libedit', '--with-libedit', '--without-libedit')
25+
->optionalLib('libedit', '--with-readline', '--without-readline')
2626
->configure(
2727
'--disable-nls',
2828
'--disable-rpath',

0 commit comments

Comments
 (0)