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 unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: metadata.mk,v 1.2 2011/12/13 16:35:48 joerg Exp $ 1# $NetBSD: metadata.mk,v 1.3 2012/05/13 08:20:11 obache Exp $
2 2
3###################################################################### 3######################################################################
4### The targets below are all PRIVATE. 4### The targets below are all PRIVATE.
5###################################################################### 5######################################################################
6 6
7###################################################################### 7######################################################################
8### 8###
9### Temporary package meta-data directory. The contents of this directory 9### Temporary package meta-data directory. The contents of this directory
10### are copied directly into the real package meta-data directory. 10### are copied directly into the real package meta-data directory.
11### 11###
12PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb 12PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb
13 13
14unprivileged-install-hook: ${PKG_DB_TMPDIR} 14unprivileged-install-hook: ${PKG_DB_TMPDIR}
@@ -56,27 +56,27 @@ ${_BUILD_INFO_FILE}: plist @@ -56,27 +56,27 @@ ${_BUILD_INFO_FILE}: plist
56 ${RUN}${ECHO} "BUILD_DATE=${_BUILD_DATE_cmd:sh}" >> ${.TARGET}.tmp 56 ${RUN}${ECHO} "BUILD_DATE=${_BUILD_DATE_cmd:sh}" >> ${.TARGET}.tmp
57 ${RUN}${ECHO} "BUILD_HOST=${_BUILD_HOST_cmd:sh}" >> ${.TARGET}.tmp 57 ${RUN}${ECHO} "BUILD_HOST=${_BUILD_HOST_cmd:sh}" >> ${.TARGET}.tmp
58.if !empty(CHECK_SHLIBS_SUPPORTED:M[yY][eE][sS]) 58.if !empty(CHECK_SHLIBS_SUPPORTED:M[yY][eE][sS])
59 ${RUN} \ 59 ${RUN} \
60 case ${LDD:Q}"" in \ 60 case ${LDD:Q}"" in \
61 "") ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \ 61 "") ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \
62 *) ldd=${LDD:Q} ;; \ 62 *) ldd=${LDD:Q} ;; \
63 esac; \ 63 esac; \
64 bins=`${AWK} '/(^|\/)(bin|sbin|libexec)\// { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \ 64 bins=`${AWK} '/(^|\/)(bin|sbin|libexec)\// { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \
65 case ${OBJECT_FMT:Q}"" in \ 65 case ${OBJECT_FMT:Q}"" in \
66 ELF) \ 66 ELF) \
67 libs=`${AWK} '/\/lib.*\.so(\.[0-9]+)*$$/ { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \ 67 libs=`${AWK} '/\/lib.*\.so(\.[0-9]+)*$$/ { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \
68 if ${TEST} -n "$$bins" -o -n "$$libs"; then \ 68 if ${TEST} -n "$$bins" -o -n "$$libs"; then \
69 requires=`($$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '$$2 == "=>" && $$3 ~ "/" { print $$3 }' | ${SORT} -u`; \ 69 requires=`(${PKGSRC_SETENV} ${LDD_ENV:U} $$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '$$2 == "=>" && $$3 ~ "/" { print $$3 }' | ${SORT} -u`; \
70 fi; \ 70 fi; \
71 linklibs=`${AWK} '/.*\.so(\.[0-9]+)*$$/ { print "${DESTDIR}${PREFIX}/" $$0 }' ${_PLIST_NOKEYWORDS}`; \ 71 linklibs=`${AWK} '/.*\.so(\.[0-9]+)*$$/ { print "${DESTDIR}${PREFIX}/" $$0 }' ${_PLIST_NOKEYWORDS}`; \
72 for i in $$linklibs; do \ 72 for i in $$linklibs; do \
73 if ${TEST} -r $$i -a ! -x $$i -a ! -h $$i; then \ 73 if ${TEST} -r $$i -a ! -x $$i -a ! -h $$i; then \
74 ${TEST} ${PKG_DEVELOPER:Uno:Q}"" = "no" || \ 74 ${TEST} ${PKG_DEVELOPER:Uno:Q}"" = "no" || \
75 ${ECHO} "$$i: installed without execute permission; fixing (should use [BSD_]INSTALL_LIB)"; \ 75 ${ECHO} "$$i: installed without execute permission; fixing (should use [BSD_]INSTALL_LIB)"; \
76 ${CHMOD} +x $$i; \ 76 ${CHMOD} +x $$i; \
77 fi; \ 77 fi; \
78 done; \ 78 done; \
79 ;; \ 79 ;; \
80 Mach-O) \ 80 Mach-O) \
81 libs=`${AWK} '/\/lib.*\.dylib/ { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \ 81 libs=`${AWK} '/\/lib.*\.dylib/ { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \
82 if ${TEST} "$$bins" != "" -o "$$libs" != ""; then \ 82 if ${TEST} "$$bins" != "" -o "$$libs" != ""; then \
cvs diff -r1.34 -r1.35 pkgsrc/mk/platform/OpenBSD.mk (expand / switch to unified 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,18 +1,21 @@ @@ -1,18 +1,21 @@
1# $NetBSD: OpenBSD.mk,v 1.34 2012/05/04 11:46:02 obache Exp $ 1# $NetBSD: OpenBSD.mk,v 1.35 2012/05/13 08:20:11 obache Exp $
2# 2#
3# Variable definitions for the OpenBSD operating system. 3# Variable definitions for the OpenBSD operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
 6LDD?= /usr/bin/ldd
 7LDD_ENV?= LD_TRACE_LOADED_OBJECTS_FMT1='\t-l%o => %p\n' \
 8 LD_TRACE_LOADED_OBJECTS_FMT2=
6IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake 9IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
7PKGLOCALEDIR?= share 10PKGLOCALEDIR?= share
8PS?= /bin/ps 11PS?= /bin/ps
9# XXX: default from defaults/mk.conf. Verify/correct for this platform 12# XXX: default from defaults/mk.conf. Verify/correct for this platform
10# and remove this comment. 13# and remove this comment.
11SU?= /usr/bin/su 14SU?= /usr/bin/su
12TYPE?= type # Shell builtin 15TYPE?= type # Shell builtin
13 16
14.if exists(/usr/sbin/user) 17.if exists(/usr/sbin/user)
15USERADD?= /usr/sbin/useradd 18USERADD?= /usr/sbin/useradd
16GROUPADD?= /usr/sbin/groupadd 19GROUPADD?= /usr/sbin/groupadd
17.endif 20.endif
18 21