installworld: handle ldd including preloaded objects

[emaste]

Summary

The installworld target makes a temporary copy of binaries to be used
during the install.  Libraries that they depend on are also included,
found by using `ldd`.

After commit 0913953c9ed0 ldd started listing preloaded objects,
including [vdso], under a [preloaded] header.  Stop parsing ldd output
once we reach the preloaded section.

[emaste]

Referenced commit 0913953c9ed0

[emaste]

Missing ;

[cy]

Works

[emaste]

I missed the sort -u, [preloaded] is the first line of output

[emaste]

sort and unique library list after parsing

[emaste]

Still no good since we pass all $progs to one ldd invocation

[emaste]

just skip over [preloaded] and [vdso]

[cy]

I see that.

Either:

1.multiple invocations of ldd (not preferred), or

2. ignore everything between "[preloaded]" and the next line that contains /^\//, or
3. simply ignore lines that begin with / or [ using awk

IMO options 1 & 2 are klunky. Option 3 is better but still inelegant, without overcomplicating it.

[kib]

I can put printing of the preloaded objects under the option/env var, but I did not wanted to do that.

[cy]

Further to my previous comment, I'm thinking:

libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | \
    awk '$$1 !~ /:$$/ && $$1 !~ /^\[.*\]/ {print}' | sort -u | \
    while read line; do \
        set -- $$line; \
        if [ "$$2 $$3" != "not found" ]; then \
                echo $$2; \
        else \
                echo "Required library $$1 not found." >&2; \
                exit 1; \
        fi; \
    done); \

Or as a diff:

diff --git a/Makefile.inc1 b/Makefile.inc1
index 04c44d8e297b..2be0980e503d 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1366,7 +1366,8 @@ distributeworld installworld stageworld: _installcheck_world .PHONY
                fi; \
            done); \
        if [ -z "${CROSSBUILD_HOST}" ] ; then \
-           libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
+         libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | \
+             awk '$$1 !~ /:$$/ && $$1 !~ /^\[.*\]/ {print}' | sort -u | \
                    while read line; do \
                        set -- $$line; \
                        if [ "$$2 $$3" != "not found" ]; then \

[kevans]

Makefile.inc1

1369

|| -> -o for test(1)

[emaste]

use a case statement to skip everything enclosed in square brackets

[cy]

The case construct is probably the most elegant solution.

[bdrewery]

This vdso thing happens when building releng/12.3 as well. Edit: I suppose it will happen on any older builds but this branch is at least still supported.