From 15961000ec8c159a1dd7d5f96c2267040c87822c Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 4 Jun 2020 11:54:43 +0200
Subject: pin-dependencies.PKGBUILDpatch: mark pinned_dependencies with a
 comment

---
 pin-dependencies.PKGBUILDpatch | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'pin-dependencies.PKGBUILDpatch')

diff --git a/pin-dependencies.PKGBUILDpatch b/pin-dependencies.PKGBUILDpatch
index a06c768e0..4d5540699 100644
--- a/pin-dependencies.PKGBUILDpatch
+++ b/pin-dependencies.PKGBUILDpatch
@@ -45,9 +45,24 @@ if printf '%s\n' "${arch[@]}" | grep -qvxF any; then
       | sed 's/[<>]\?=.*$//' \
       | sort -u
     ) <(
-      printf '%s\n' "${_pinned_dependencies[@]}" \
-      | sed 's/=.*$//' \
-      | sort -u
+      {
+        eval 'printf '"'"'%s\n'"'"' "${depends[@]}" "${depends_'"${CARCH}"'[@]}"' \
+        | sed 's/=.*$//' \
+        | sort -u
+        sed -n '
+          /^\s*# _pinned_dependencies$/,/^\s*# _pinned_dependencies\.end$/ p
+        ' "${OLDPWD}/PKGBUILD" \
+        | sed '
+          /^\s*#/d
+          s/^\s\+//
+          s/\s\+$//
+          s/^\(["'"'"']\)\(\S\+\)\1$/\2/
+          s/[<>]\?=.*$//
+        ' \
+        | sort -u
+      } \
+      | sort \
+      | uniq -d
     )
   ); then
     printf 'There are discrepancies between the _pinned_dependencies and the linked libraries in %s'"'"'s %s:\n' \
@@ -64,13 +79,4 @@ if printf '%s\n' "${arch[@]}" | grep -qvxF any; then
     | sort -k1,1
     return 1
   fi
-  depends+=(
-    $(
-      [ "${CARCH}" = 'x86_64' ] && _suffix='-64' || _suffix='-32'
-      printf '%s\n' "${_pinned_dependencies[@]}" \
-      | sed '
-        /\.so=/ s/$/'"${_suffix}"'/
-      '
-    )
-  )
 fi
-- 
cgit v1.2.3-70-g09d2