commit 57a987c8e31b77ec6270a97a900e951f8bb24593
parent bcb64083828e8258acfb67deb93fd1d6f8026fa4
Author: Christian Grothoff <christian@grothoff.org>
Date: Tue, 31 Mar 2026 18:25:45 +0200
-do not fail if jq is unavailable
Diffstat:
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/m4/make-sbom.m4 b/m4/make-sbom.m4
@@ -71,7 +71,7 @@ AC_DEFUN([MHD_GENERATE_SBOM3], [
relationshipType:"DEPENDS_ON",
from:"SPDXRef-Package-libmicrohttpd2",
to:"SPDXRef-Package-GnuTLS"
- }]]'
+ }]]'
jq --arg ver "$dep_ver" "$jqprog" \
< libmicrohttpd-spdx.json \
> libmicrohttpd-spdx.json.tmp &&
@@ -91,7 +91,7 @@ AC_DEFUN([MHD_GENERATE_SBOM3], [
name:"mbedTLS",
versionInfo:$ver,
homepage: "https://www.trustedfirmware.org/projects/mbed-tls/",
- downloadLocation: "https://github.com/Mbed-TLS/mbedtls",
+ downloadLocation: "https://github.com/Mbed-TLS/mbedtls",
licenseConcluded: "Apache-2.0",
licenseDeclared: "Apache-2.0"
}]] |
@@ -101,7 +101,7 @@ AC_DEFUN([MHD_GENERATE_SBOM3], [
relationshipType:"DEPENDS_ON",
from:"SPDXRef-Package-libmicrohttpd2",
to:"SPDXRef-Package-mbedTLS"
- }]]'
+ }]]'
jq --arg ver "$dep_ver" "$jqprog" \
< libmicrohttpd-spdx.json \
> libmicrohttpd-spdx.json.tmp &&
@@ -113,7 +113,7 @@ AC_DEFUN([MHD_GENERATE_SBOM3], [
AC_MSG_NOTICE([SBOM written to libmicrohttpd-spdx.json])
else
- AC_MSG_WARN([jq not available, SBOM not generated])
+ AC_MSG_WARN([jq not available, only dumping incomplete SBOM template])
+ cp "$srcdir/libmicrohttpd-spdx.json.in" libmicrohttpd-spdx.json
fi
])
-