change --with-prefix to --with-path, add --enable-path (yes, grpc uses that...)

This commit is contained in:
DubbleClick
2025-07-22 18:29:58 +07:00
parent 3ca7c15208
commit 9172c39a26
3 changed files with 20 additions and 24 deletions

View File

@@ -34,7 +34,7 @@
}, },
"bz2": { "bz2": {
"type": "builtin", "type": "builtin",
"arg-type-unix": "with-prefix", "arg-type-unix": "with-path",
"arg-type-windows": "with", "arg-type-windows": "with",
"lib-depends": [ "lib-depends": [
"bzip2" "bzip2"
@@ -185,7 +185,7 @@
"BSD": "wip" "BSD": "wip"
}, },
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"lib-depends": [ "lib-depends": [
"gettext" "gettext"
] ]
@@ -211,7 +211,7 @@
"BSD": "wip" "BSD": "wip"
}, },
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"lib-depends": [ "lib-depends": [
"gmp" "gmp"
] ]
@@ -233,7 +233,7 @@
}, },
"type": "external", "type": "external",
"source": "grpc", "source": "grpc",
"arg-type-unix": "custom", "arg-type-unix": "enable-path",
"cpp-extension": true, "cpp-extension": true,
"lib-depends": [ "lib-depends": [
"grpc" "grpc"
@@ -244,7 +244,7 @@
"BSD": "wip" "BSD": "wip"
}, },
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"arg-type-windows": "with", "arg-type-windows": "with",
"lib-depends-unix": [ "lib-depends-unix": [
"libiconv" "libiconv"
@@ -320,7 +320,7 @@
"BSD": "wip" "BSD": "wip"
}, },
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"lib-depends": [ "lib-depends": [
"ldap" "ldap"
], ],
@@ -529,7 +529,7 @@
}, },
"notes": true, "notes": true,
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"lib-depends": [ "lib-depends": [
"libargon2" "libargon2"
] ]
@@ -571,7 +571,7 @@
"BSD": "wip" "BSD": "wip"
}, },
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"arg-type-windows": "custom", "arg-type-windows": "custom",
"ext-depends": [ "ext-depends": [
"pdo", "pdo",
@@ -674,7 +674,7 @@
"BSD": "wip" "BSD": "wip"
}, },
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"lib-depends": [ "lib-depends": [
"readline" "readline"
], ],
@@ -785,7 +785,7 @@
"BSD": "wip" "BSD": "wip"
}, },
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"arg-type-windows": "with", "arg-type-windows": "with",
"lib-depends": [ "lib-depends": [
"sqlite" "sqlite"
@@ -811,7 +811,7 @@
}, },
"type": "external", "type": "external",
"source": "ext-ssh2", "source": "ext-ssh2",
"arg-type": "with-prefix", "arg-type": "with-path",
"arg-type-windows": "with", "arg-type-windows": "with",
"lib-depends": [ "lib-depends": [
"libssh2" "libssh2"
@@ -937,7 +937,7 @@
"BSD": "wip" "BSD": "wip"
}, },
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"lib-depends": [ "lib-depends": [
"tidy" "tidy"
] ]
@@ -953,7 +953,7 @@
}, },
"type": "external", "type": "external",
"source": "ext-uuid", "source": "ext-uuid",
"arg-type": "with-prefix", "arg-type": "with-path",
"lib-depends": [ "lib-depends": [
"libuuid" "libuuid"
] ]
@@ -965,7 +965,7 @@
}, },
"type": "external", "type": "external",
"source": "ext-uv", "source": "ext-uv",
"arg-type": "with-prefix", "arg-type": "with-path",
"lib-depends": [ "lib-depends": [
"libuv" "libuv"
], ],
@@ -1067,7 +1067,7 @@
"BSD": "wip" "BSD": "wip"
}, },
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"lib-depends": [ "lib-depends": [
"libxslt" "libxslt"
], ],
@@ -1104,7 +1104,7 @@
}, },
"type": "external", "type": "external",
"source": "yaml", "source": "yaml",
"arg-type-unix": "with-prefix", "arg-type-unix": "with-path",
"arg-type-windows": "with", "arg-type-windows": "with",
"lib-depends": [ "lib-depends": [
"libyaml" "libyaml"
@@ -1115,7 +1115,7 @@
"BSD": "wip" "BSD": "wip"
}, },
"type": "builtin", "type": "builtin",
"arg-type": "with-prefix", "arg-type": "with-path",
"arg-type-windows": "enable", "arg-type-windows": "enable",
"lib-depends-unix": [ "lib-depends-unix": [
"libzip" "libzip"

View File

@@ -86,10 +86,11 @@ class Extension
$_name = str_replace('_', '-', $this->name); $_name = str_replace('_', '-', $this->name);
return match ($arg_type = Config::getExt($this->name, 'arg-type', 'enable')) { return match ($arg_type = Config::getExt($this->name, 'arg-type', 'enable')) {
'enable' => '--enable-' . $_name . ($shared ? '=shared' : '') . ' ', 'enable' => '--enable-' . $_name . ($shared ? '=shared' : '') . ' ',
'enable-path' => '--enable-' . $_name . '=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . ' ',
'with' => '--with-' . $_name . ($shared ? '=shared' : '') . ' ', 'with' => '--with-' . $_name . ($shared ? '=shared' : '') . ' ',
'with-prefix' => '--with-' . $_name . '=' . ($shared ? 'shared,' : '') . '"' . BUILD_ROOT_PATH . '" ', 'with-path' => '--with-' . $_name . '=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . ' ',
'none', 'custom' => '', 'none', 'custom' => '',
default => throw new WrongUsageException("argType does not accept {$arg_type}, use [enable/with/with-prefix] ."), default => throw new WrongUsageException("argType does not accept {$arg_type}, use [enable/with/with-path] ."),
}; };
} }

View File

@@ -45,11 +45,6 @@ class grpc extends Extension
return true; return true;
} }
public function getUnixConfigureArg(bool $shared = false): string
{
return '--enable-grpc=' . ($shared ? 'shared' : '') . BUILD_ROOT_PATH;
}
public function patchBeforeMake(): bool public function patchBeforeMake(): bool
{ {
$extra_libs = trim(getenv('SPC_EXTRA_LIBS')); $extra_libs = trim(getenv('SPC_EXTRA_LIBS'));