diff options
| author | obache <obache@pkgsrc.org> | 2012-05-13 08:20:11 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-05-13 08:20:11 +0000 |
| commit | 413e528ba3db677eaf4ac6fe01b29f5a3a0ca0c6 (patch) | |
| tree | c1ed876638d04590eefebb3333a01bac8491071a /mk | |
| parent | f6f3920aa327de0832a2bd085436ce69707e58ff (diff) | |
| download | pkgsrc-413e528ba3db677eaf4ac6fe01b29f5a3a0ca0c6.tar.gz | |
Set LD_TRACE_LOADED_OBJECTS_FMT{1,2} for OpenBSD so that output of ldd will be
expected format.
workaround of PR 38838.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pkgformat/pkg/metadata.mk | 4 | ||||
| -rw-r--r-- | mk/platform/OpenBSD.mk | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mk/pkgformat/pkg/metadata.mk b/mk/pkgformat/pkg/metadata.mk index 566008a9290..5ecca4adca2 100644 --- a/mk/pkgformat/pkg/metadata.mk +++ b/mk/pkgformat/pkg/metadata.mk @@ -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 @@ ${_BUILD_INFO_FILE}: plist 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 --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk index 2d16828794a..c17bd6cb980 100644 --- a/mk/platform/OpenBSD.mk +++ b/mk/platform/OpenBSD.mk @@ -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 |