diff options
| author | joerg <joerg@pkgsrc.org> | 2016-04-10 15:58:02 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-04-10 15:58:02 +0000 |
| commit | a497b4efbc4f2224de42dbe984d4ba19106f256d (patch) | |
| tree | ca139b801ca51ee063165400f44be14eed94369e /mk/check | |
| parent | b6b9f4a1e6d214b96f03df58daa363d33e5e9f93 (diff) | |
| download | pkgsrc-a497b4efbc4f2224de42dbe984d4ba19106f256d.tar.gz | |
Remove support for USE_DESTDIR=no.
Diffstat (limited to 'mk/check')
| -rw-r--r-- | mk/check/check-shlibs.mk | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/mk/check/check-shlibs.mk b/mk/check/check-shlibs.mk index 68431fd0cd9..cf931b10b03 100644 --- a/mk/check/check-shlibs.mk +++ b/mk/check/check-shlibs.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-shlibs.mk,v 1.28 2015/11/24 09:41:20 jperkin Exp $ +# $NetBSD: check-shlibs.mk,v 1.29 2016/04/10 15:58:02 joerg Exp $ # # This file verifies that all libraries used by the package can be found # at run-time. @@ -63,9 +63,7 @@ CHECK_SHLIBS_NATIVE= ${PKGSRCDIR}/mk/check/check-shlibs-macho.awk CHECK_SHLIBS_NATIVE_ENV+= CROSS_DESTDIR=${_CROSS_DESTDIR:Q} CHECK_SHLIBS_NATIVE_ENV+= PKG_INFO_CMD=${PKG_INFO:Q} CHECK_SHLIBS_NATIVE_ENV+= DEPENDS_FILE=${_RRDEPENDS_FILE:Q} -. if ${_USE_DESTDIR} != "no" CHECK_SHLIBS_NATIVE_ENV+= DESTDIR=${DESTDIR:Q} -. endif CHECK_SHLIBS_NATIVE_ENV+= WRKDIR=${WRKDIR:Q} . if defined(CHECK_WRKREF) && !empty(CHECK_WRKREF:Mextra) CHECK_SHLIBS_NATIVE_ENV+= CHECK_WRKREF_EXTRA_DIRS=${CHECK_WRKREF_EXTRA_DIRS:Q} @@ -88,38 +86,6 @@ _check-shlibs: error-check .PHONY ${PKGSRC_SETENV} ${CHECK_SHLIBS_NATIVE_ENV} ${AWK} -f ${CHECK_SHLIBS_NATIVE} > ${ERROR_DIR}/${.TARGET} .else -. if ${_USE_DESTDIR} != "no" _check-shlibs: error-check .PHONY @${WARNING_MSG} "Skipping missing run-time search-path check in DESTDIR mode." -. else -_check-shlibs: error-check .PHONY - @${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}" - ${RUN} rm -f ${ERROR_DIR}/${.TARGET} - ${RUN} \ - exec 1>${ERROR_DIR}/${.TARGET}; \ - case ${LDD:Q}"" in \ - "") ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \ - *) ldd=${LDD:Q} ;; \ - esac; \ - ${TEST} -x "$$ldd" || exit 0; \ - cd ${DESTDIR}${PREFIX}; \ - ${_CHECK_SHLIBS_FILELIST_CMD} | \ - ${EGREP} -h ${_CHECK_SHLIBS_ERE:Q} | \ - while read file; do \ - case "$$file" in \ - ${CHECK_SHLIBS_SKIP:@p@${p}) continue ;;@} \ - *) ;; \ - esac; \ - err=`$$ldd $$file 2>&1 | ${GREP} "not found" || ${TRUE}`; \ - ${TEST} -z "$$err" || ${ECHO} "${DESTDIR}${PREFIX}/$$file: $$err"; \ - done - ${RUN} \ - exec 1>>${ERROR_DIR}/${.TARGET}; \ - if ${_NONZERO_FILESIZE_P} ${ERROR_DIR}/${.TARGET}; then \ - ${ECHO} "*** The programs/libs shown above will not find the listed"; \ - ${ECHO} " shared libraries at runtime."; \ - ${ECHO} " Please fix the package (add -Wl,-R.../lib in the right places)!"; \ - ${SHCOMMENT} Might not error-out for non-pkg-developers; \ - fi -. endif .endif |