CVS commit: pkgsrc/mk/check

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan  8 10:28:09 UTC 2025

Modified Files:
        pkgsrc/mk/check: check-shlibs-elf.awk

Log Message:
check-shlibs-elf: Look in DESTDIR before LOCALBASE.

Fixes issue with check-shlibs where a package is already installed when
the check is performed, finds the installed libraries first, and then
complains that the package isn't a dependency of itself.

Mirrors change already made in mktool, and has been tested in my tree
for the past 8 months.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mk/check/check-shlibs-elf.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/check/check-shlibs-elf.awk
diff -u pkgsrc/mk/check/check-shlibs-elf.awk:1.21 pkgsrc/mk/check/check-shlibs-elf.awk:1.22
--- pkgsrc/mk/check/check-shlibs-elf.awk:1.21   Fri Oct 11 08:24:48 2024
+++ pkgsrc/mk/check/check-shlibs-elf.awk        Wed Jan  8 10:28:09 2025
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs-elf.awk,v 1.21 2024/10/11 08:24:48 jperkin Exp $
+# $NetBSD: check-shlibs-elf.awk,v 1.22 2025/01/08 10:28:09 jperkin Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
 # All rights reserved.
@@ -135,6 +135,14 @@ function checkshlib(DSO, needed, rpath, 
        for (lib in needed) {
                found = 0
                for (p = 1; p <= nrpath; p++) {
+                       libfile = destdir rpath[p] "/" lib
+                       if (!(libfile in libcache)) {
+                               libcache[libfile] = system("test -f " shquote(libfile))
+                       }
+                       if (!libcache[libfile]) {
+                               found = 1
+                               break
+                       }
                        libfile = cross_destdir rpath[p] "/" lib
                        if (!(libfile in libcache)) {
                                libcache[libfile] = system("test -f " shquote(libfile))
@@ -155,14 +163,6 @@ function checkshlib(DSO, needed, rpath, 
                                found = 1
                                break
                        }
-                       libfile = destdir rpath[p] "/" lib
-                       if (!(libfile in libcache)) {
-                               libcache[libfile] = system("test -f " shquote(libfile))
-                       }
-                       if (!libcache[libfile]) {
-                               found = 1
-                               break
-                       }
                }
                if (found == 0)
                        print DSO ": missing library: " lib;