diff options
author | B. Watson <urchlay@slackware.uk> | 2023-05-30 15:55:00 -0400 |
---|---|---|
committer | B. Watson <urchlay@slackware.uk> | 2023-05-30 15:55:00 -0400 |
commit | 254f6d6ad88ea246b7a3cbd66f0aa6f5d3ff99ff (patch) | |
tree | 3c0acf835d8038a433be95819be14a72e70554cf | |
parent | 8d86b0d23ed3c67f083cbc472300c0362f594adf (diff) | |
download | sbo-maintainer-tools-254f6d6ad88ea246b7a3cbd66f0aa6f5d3ff99ff.tar.gz |
sbolint: detect use of LIBDIRSUFFIX and SLKCFLAGS on the same line.
-rwxr-xr-x | sbolint | 21 |
1 files changed, 13 insertions, 8 deletions
@@ -1264,14 +1264,6 @@ sub check_script { if($output !~ m,\$\{OUTPUT:-(?:/tmp|(["'])/tmp\1)\},) { log_error("$file:$lineno: OUTPUT=\${OUTPUT:-/tmp} is required"); } - } elsif(/^[^#]*LIBDIRSUFFIX=/) { - $libsuf_set = $lineno; - } elsif(/^[^#]*SLKCFLAGS=/) { - $flags_set = $lineno; - } elsif(/^[^#]*\$\{?LIBDIRSUFFIX/) { - $libsuf_used = $lineno; - } elsif(/^[^#]*\$\{?SLKCFLAGS/) { - $flags_used = $lineno; } elsif(/^[^#]*\$\{?CWD\}?\/doinst\.sh(?:"|'|\s|>)/) { # 20220205 bkw: some scripts don't have a doinst.sh in the # script dir, but they create one with >> (the jack rt audio stuff @@ -1353,6 +1345,19 @@ sub check_script { if(/^\s*python3\s/) { $have_py3 = $lineno; } + + if(/^[^#]*LIBDIRSUFFIX=/) { + $libsuf_set = $lineno; + } + if(/^[^#]*SLKCFLAGS=/) { + $flags_set = $lineno; + } + if(/^[^#]*\$\{?LIBDIRSUFFIX/) { + $libsuf_used = $lineno; + } + if(/^[^#]*\$\{?SLKCFLAGS/) { + $flags_used = $lineno; + } } if(not defined($prgnam)) { |