From f7e86f43594280c6648a6e31f9884f3158dfce3a Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Tue, 16 May 2023 01:31:42 -0400
Subject: sbolint: allow -march= in comments. sbodl: fix spacing.
---
sbodl | 2 +-
sbolint | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sbodl b/sbodl
index 2db3409..d863500 100755
--- a/sbodl
+++ b/sbodl
@@ -145,7 +145,7 @@ for dl in $DL; do
if [ -e "$FILE" ]; then
GOTSUM="$( md5sum "$FILE" | cut -d' ' -f1 )"
if [ "$1" != "$GOTSUM" ]; then
- echo -e "${RED}WARN: md5sum doesn't match${COLOR_OFF}\\n expected: $1\\n got: $GOTSUM"
+ echo -e "${RED}WARN: md5sum doesn't match${COLOR_OFF}\\n expected: $1\\n got: $GOTSUM"
else
echo -e "${GREEN}md5sum matches OK${COLOR_OFF}: $1"
fi
diff --git a/sbolint b/sbolint
index 3b252dc..5e574fc 100755
--- a/sbolint
+++ b/sbolint
@@ -1262,7 +1262,8 @@ sub check_script {
}
} elsif(/^PKG=(\S+)/) {
$pkg = dequote($1);
- if($pkg ne '$TMP/package-$PRGNAM') {
+ $pkg =~ s,\$\{([A-Z]+)\},\$$1,; # de-brace
+ if($pkg ne '$TMP/package-$PRGNAM' && $pkg ne '$TMP/package-${PRGNAM}') {
log_error("$file:$lineno: PKG=\$TMP/package-\$PRGNAM is required");
}
} elsif(/^OUTPUT=(\S+)/) {
@@ -1333,7 +1334,7 @@ sub check_script {
$old_arch = $lineno;
}
- if(/-march=['"]?i[34]86/) {
+ if(/^[^#]*\s-march=['"]?i[34]86/) {
$old_flags = $lineno;
}
--
cgit v1.2.3