Attachment 222870 Details for Bug 253727 – LD_LIBRARY_PATH patch

[patch] LD_LIBRARY_PATH patch

Makefile.inc1-install-LD_PATH.diff (text/plain), 1.29 KB, created by ota on 2021-02-27 23:09:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ota

Created: 2021-02-27 23:09:01 UTC

Size: 1.29 KB

patch

obsolete

>diff --git a/Makefile.inc1 b/Makefile.inc1
>index f27cd270635..f3b76814c5e 100644
>--- a/Makefile.inc1
>+++ b/Makefile.inc1
>@@ -717,6 +717,7 @@ BOOTSTRAPPING_OSRELDATE?=${OSRELDATE}
> BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
> 		TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \
> 		PATH=${BPATH}:${PATH} \
>+		LD_LIBRARY_PATH=${WORLDTMP}/lib:${WORLDTMP}/usr/lib:${LD_LIBRARY_PATH} \
> 		WORLDTMP=${WORLDTMP} \
> 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
> # need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
>@@ -764,6 +765,7 @@ XMAKE=		${BMAKE} \
> # kernel-tools stage
> KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
> 		PATH=${BPATH}:${PATH} \
>+		LD_LIBRARY_PATH=${WORLDTMP}/lib:${WORLDTMP}/usr/lib:${LD_LIBRARY_PATH} \
> 		WORLDTMP=${WORLDTMP} \
> 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
> 
>@@ -1357,7 +1359,7 @@ 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=$$(LD_LIBRARY_PATH=${WORLDTMP}/lib:${WORLDTMP}/usr/lib:${LD_LIBRARY_PATH} ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
> 		    while read line; do \
> 			set -- $$line; \
> 			if [ "$$2 $$3" != "not found" ]; then \

Actions: View | Diff

Attachments on bug 253727: 222870