[pkgsrc/trunk]: pkgsrc/mk/platform Set LD_TRACE_LOADED_OBJECTS_FMT{1,2} for O...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/669802b50e53
branches:  trunk
changeset: 603778:669802b50e53
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun May 13 08:20:11 2012 +0000

description:
Set LD_TRACE_LOADED_OBJECTS_FMT{1,2} for OpenBSD so that output of ldd will be
expected format.

workaround of PR 38838.

diffstat:

 mk/pkgformat/pkg/metadata.mk |  4 ++--
 mk/platform/OpenBSD.mk       |  5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r c29067e892e5 -r 669802b50e53 mk/pkgformat/pkg/metadata.mk
--- a/mk/pkgformat/pkg/metadata.mk      Sun May 13 08:10:12 2012 +0000
+++ b/mk/pkgformat/pkg/metadata.mk      Sun May 13 08:20:11 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.2 2011/12/13 16:35:48 joerg Exp $
+# $NetBSD: metadata.mk,v 1.3 2012/05/13 08:20:11 obache Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -66,7 +66,7 @@
        ELF)                                                            \
                libs=`${AWK} '/\/lib.*\.so(\.[0-9]+)*$$/ { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \
                if ${TEST} -n "$$bins" -o -n "$$libs"; then             \
-                       requires=`($$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '$$2 == "=>" && $$3 ~ "/" { print $$3 }' | ${SORT} -u`; \
+                       requires=`(${PKGSRC_SETENV} ${LDD_ENV:U} $$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '$$2 == "=>" && $$3 ~ "/" { print $$3 }' | ${SORT} -u`; \
                fi;                                                     \
                linklibs=`${AWK} '/.*\.so(\.[0-9]+)*$$/ { print "${DESTDIR}${PREFIX}/" $$0 }' ${_PLIST_NOKEYWORDS}`; \
                for i in $$linklibs; do                                 \
diff -r c29067e892e5 -r 669802b50e53 mk/platform/OpenBSD.mk
--- a/mk/platform/OpenBSD.mk    Sun May 13 08:10:12 2012 +0000
+++ b/mk/platform/OpenBSD.mk    Sun May 13 08:20:11 2012 +0000
@@ -1,8 +1,11 @@
-# $NetBSD: OpenBSD.mk,v 1.34 2012/05/04 11:46:02 obache Exp $
+# $NetBSD: OpenBSD.mk,v 1.35 2012/05/13 08:20:11 obache Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
 ECHO_N?=       ${ECHO} -n
+LDD?=          /usr/bin/ldd
+LDD_ENV?=      LD_TRACE_LOADED_OBJECTS_FMT1='\t-l%o => %p\n' \
+               LD_TRACE_LOADED_OBJECTS_FMT2=
 IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 PKGLOCALEDIR?= share
 PS?=           /bin/ps