Attachment 245093 Details for Bug 270035 – Patch for qa.sh

[patch] Patch for qa.sh

qa.sh.gitdiff (text/plain), 995 bytes, created by Fernando Apesteguía on 2023-09-21 13:53:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2023-09-21 13:53:33 UTC

Size: 995 bytes

patch

obsolete

>diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
>index 63fa9f6f370e..cd9f594c5607 100644
>--- a/Mk/Scripts/qa.sh
>+++ b/Mk/Scripts/qa.sh
>@@ -115,7 +115,10 @@ baselibs() {
> 	local rc
> 	local found_openssl
> 	local file
>+	local provides_ssllibs
> 	[ "${PKGBASE}" = "pkg" -o "${PKGBASE}" = "pkg-devel" ] && return
>+
>+	provides_ssllibs=$(list_stagedir_elfs $ -name 'libcrypto.so*' -or -name 'libssl.so*' $)
> 	while read -r f; do
> 		case ${f} in
> 		File:\ .*)
>@@ -136,10 +139,12 @@ baselibs() {
> 	done <<-EOF
> 	$(list_stagedir_elfs -exec readelf -d {} + 2>/dev/null)
> 	EOF
>-	if [ -z "${USESSSL}" -a -n "${found_openssl}" ]; then
>-		warn "you need USES=ssl"
>-	elif [ -n "${USESSSL}" -a -z "${found_openssl}" ]; then
>-		warn "you may not need USES=ssl"
>+	if [ -z "${provides_ssllibs}" ]; then
>+		if [ -z "${USESSSL}" -a -n "${found_openssl}" ]; then
>+			warn "you need USES=ssl"
>+		elif [ -n "${USESSSL}" -a -z "${found_openssl}" ]; then
>+			warn "you may not need USES=ssl"
>+		fi
> 	fi
> 	return ${rc}
> }

Actions: View | Diff

Attachments on bug 270035: 245093