From be92a87371382cceba77d01ca7a7e40a770ca6e9 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Jun 2021 11:48:25 +0200 Subject: [PATCH] Fix PHP_ADD_EXTENSION_DEP without indentation Adjust FS in order_by_dep.awk to only each whitespace around (,) rather than any whitespace. Thus a leading indent does not result in a separate element. --- build/order_by_dep.awk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/order_by_dep.awk b/build/order_by_dep.awk index ad3781101b7..1e71ea2069d 100644 --- a/build/order_by_dep.awk +++ b/build/order_by_dep.awk @@ -10,14 +10,14 @@ function get_deps(module_name, module_dir, depline, cmd) { # this could probably be made *much* better RS=orig_rs; - FS="[(,) \t]+" + FS="[ \t]*[(,)][ \t]*" cmd = "grep PHP_ADD_EXTENSION_DEP " module_dir "/config*.m4" while (cmd | getline) { -# printf("GOT: %s,%s,%s,%s,%s\n", $1, $2, $3, $4, $5); - if (!length($5)) { - $5 = 0; + #printf("GOT: %s,%s,%s,%s\n", $1, $2, $3, $4); + if (!length($4)) { + $4 = 0; } - mod_deps[module_name, $4] = $5; + mod_deps[module_name, $3] = $4; } close(cmd) RS=" ";