Sun May 13 08:20:11 2012 UTC ()
Set LD_TRACE_LOADED_OBJECTS_FMT{1,2} for OpenBSD so that output of ldd will be
expected format.

workaround of PR 38838.


(obache)
diff -r1.2 -r1.3 pkgsrc/mk/pkgformat/pkg/metadata.mk
diff -r1.34 -r1.35 pkgsrc/mk/platform/OpenBSD.mk

cvs diff -r1.2 -r1.3 pkgsrc/mk/pkgformat/pkg/metadata.mk (expand / switch to context diff)
--- pkgsrc/mk/pkgformat/pkg/metadata.mk 2011/12/13 16:35:48 1.2
+++ pkgsrc/mk/pkgformat/pkg/metadata.mk 2012/05/13 08:20:11 1.3
@@ -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					\

cvs diff -r1.34 -r1.35 pkgsrc/mk/platform/OpenBSD.mk (expand / switch to context diff)
--- pkgsrc/mk/platform/OpenBSD.mk 2012/05/04 11:46:02 1.34
+++ pkgsrc/mk/platform/OpenBSD.mk 2012/05/13 08:20:11 1.35
@@ -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