diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-07-16 05:55:14 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-07-16 05:55:14 +0000 |
| commit | 4a57b3237930b77c535e72d81fe4afefe64b70d7 (patch) | |
| tree | 5c210fef822a8e525dac3ebc87f53e9299b35dc7 /Mk | |
| parent | 52296c31b0f6657c5e18ad47ee0da381ac3e89db (diff) | |
| download | ports-4a57b3237930b77c535e72d81fe4afefe64b70d7.tar.gz ports-4a57b3237930b77c535e72d81fe4afefe64b70d7.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 39 | ||||
| -rw-r--r-- | Mk/bsd.sanity.mk | 2 |
2 files changed, 2 insertions, 39 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index da629c982ef4..ded97d9d4fe3 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4928,7 +4928,7 @@ ${deptype:tl}-depends: lib-depends: .if defined(LIB_DEPENDS) && !defined(NO_DEPENDS) @set -e ; \ - for i in ${LIB_DEPENDS:M*.so*\:*}; do \ + for i in ${LIB_DEPENDS}; do \ lib=$${i%%:*} ; \ dir=$${i#*:} ; \ target="${DEPENDS_TARGET}"; \ @@ -4957,43 +4957,6 @@ lib-depends: ${ECHO_MSG}; \ fi ; \ done - @set -e ; for i in ${LIB_DEPENDS:N*.so*\:*}; do \ - lib=$${i%%:*}; \ - pattern="`${ECHO_CMD} $$lib | ${SED} -E -e 's/\./\\\\./g' -e 's/(\\\\)?\+/\\\\+/g'`"\ - dir=$${i#*:}; \ - target=$${i##*:}; \ - if ${TEST} $$dir = $$target; then \ - target="${DEPENDS_TARGET}"; \ - depends_args="${DEPENDS_ARGS}"; \ - else \ - dir=$${dir%%:*}; \ - fi; \ - ${ECHO_MSG} -n "===> ${PKGNAME} depends on shared library: $$lib"; \ - if ${LDCONFIG} ${_LDCONFIG_FLAGS} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \ - ${ECHO_MSG} " - found"; \ - if [ ${_DEPEND_ALWAYS} = 1 ]; then \ - ${ECHO_MSG} " (but building it anyway)"; \ - notfound=1; \ - else \ - notfound=0; \ - fi; \ - else \ - ${ECHO_MSG} " - not found"; \ - notfound=1; \ - fi; \ - if [ $$notfound != 0 ]; then \ - ${ECHO_MSG} "===> Verifying $$target for $$lib in $$dir"; \ - if [ ! -d "$$dir" ]; then \ - ${ECHO_MSG} " => No directory for $$lib. Skipping.."; \ - else \ - ${_INSTALL_DEPENDS} \ - if ! ${LDCONFIG} ${_LDCONFIG_FLAGS} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \ - ${ECHO_MSG} "Error: shared library \"$$lib\" does not exist"; \ - ${FALSE}; \ - fi; \ - fi; \ - fi; \ - done .endif .endif diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 860d0ccf1abc..b56a1706f4e4 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -56,7 +56,7 @@ DEV_WARNING+= "USE_GNOME=desktopfileutils is deprecated, please use USES=desktop .endif .if defined(LIB_DEPENDS) && ${LIB_DEPENDS:Nlib*} -DEV_WARNING+= "Please use the new format for LIB_DEPENDS, see handbook for details" +DEV_ERROR+= "Please use the new format for LIB_DEPENDS, see handbook for details" .endif .if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || \ |