cpet
/
freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that all LIB_DEPENDS has been switched to modern version, remove support 

for ancient version.

Phabric:	D415
Reviewed by:	swills
This commit is contained in:
Baptiste Daroussin 2014-07-16 05:55:14 +00:00
parent 52296c31b0
commit 4a57b32379
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=362031
3 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -10,6 +10,11 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
20140715:
AUTHOR: bapt@FreeBSD.org
Only one format is now support in LIB_DEPENDS: lib*.so
20140708:
AUTHOR: mva@FreeBSD.org

39
Mk/bsd.port.mk
View File

@ -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

2
Mk/bsd.sanity.mk
View File

@ -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) || \