View | Details | Raw Unified | Return to bug 114167
Collapse All | Expand All

(-)bsd.port.mk (-10 / +20 lines)
Lines 5125-5137 Link Here
5125
lib-depends:
5134
lib-depends:
5126
.if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
5135
.if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
5127
	@for i in ${LIB_DEPENDS}; do \
5136
	@for i in ${LIB_DEPENDS}; do \
5128
		lib=$${i%%:*}; \
5137
		lib=$${i%%:*}; \
5129
		case $$lib in \
5138
		if [ -n "${IGNORE_SHLIB_NUMBERS}" -a "${IGNORE_SHLIB_NUMBERS:L}" != "no" ]; then	\
5130
			*.*.*)	pattern="`${ECHO_CMD} $$lib | ${SED} -e 's/\./\\\\./g'`" ;;\
5139
			pattern="$${lib%%.*}\."; \
5131
			*.*)	pattern="$${lib%%.*}\.$${lib#*.}" ;;\
5140
		else	\
5132
			*)	pattern="$$lib" ;;\
5141
			case $$lib in \
5133
		esac; \
5142
				*.*.*)	pattern="`${ECHO_CMD} $$lib | ${SED} -e 's/\./\\\\./g'`$$" ;;\
5143
				*.*)	pattern="$${lib%%.*}\.$${lib#*.}$$" ;;\
5144
				*)	pattern="$$lib\." ;;\
5145
			esac; \
5146
		fi;	\
5134
		dir=$${i#*:}; \
5147
		dir=$${i#*:}; \
5135
		target=$${i##*:}; \
5148
		target=$${i##*:}; \
5136
		if ${TEST} $$dir = $$target; then \
5149
		if ${TEST} $$dir = $$target; then \
5137
			target="${DEPENDS_TARGET}"; \
5150
			target="${DEPENDS_TARGET}"; \
Lines 5140-5149 Link Here
5140
			dir=$${dir%%:*}; \
5153
			dir=$${dir%%:*}; \
5141
		fi; \
5154
		fi; \
5142
		if [ -z "${DESTDIR}" ] ; then \
5155
		if [ -z "${DESTDIR}" ] ; then \
5143
			${ECHO_MSG} -n "===>   ${PKGNAME} depends on shared library: $$lib"; \
5156
			${ECHO_MSG} -n "===>   ${PKGNAME} depends on shared library: $$lib"; \
5144
			if ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
5157
			found=`${LDCONFIG} -r | ${AWK} -v skip="^${PKGCOMPATDIR:C,/+$,,}/" -v pat=":-l$$pattern" 	\
5145
				${ECHO_MSG} " - found"; \
5158
				'$$NF ~ skip {next} $$1 ~ pat { print $$NF; exit }'`;	\
5159
			if [ -n "$$found" ] ; then	\
5160
				${ECHO_MSG} " - found ($$found)"; \
5146
				if [ ${_DEPEND_ALWAYS} = 1 ]; then \
5161
				if [ ${_DEPEND_ALWAYS} = 1 ]; then \
5147
					${ECHO_MSG} "       (but building it anyway)"; \
5162
					${ECHO_MSG} "       (but building it anyway)"; \
5148
					notfound=1; \
5163
					notfound=1; \
5149
				else \
5164
				else \
Lines 5173-5183 Link Here
5173
			if [ ! -d "$$dir" ]; then \
5188
			if [ ! -d "$$dir" ]; then \
5174
				${ECHO_MSG} "     => No directory for $$lib.  Skipping.."; \
5189
				${ECHO_MSG} "     => No directory for $$lib.  Skipping.."; \
5175
			else \
5190
			else \
5176
				${_INSTALL_DEPENDS} \
5191
				${_INSTALL_DEPENDS} \
5177
				if ! ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
5192
				found=`${LDCONFIG} -r | ${AWK} -v skip="^${PKGCOMPATDIR:C,/+$,,}/" -v pat=":-l$$pattern" 	\
5178
					${ECHO_MSG} "Error: shared library \"$$lib\" does not exist"; \
5193
					'$$NF ~ skip {next} $$1 ~ pat { print $$NF; exit }'`;	\
5179
					${FALSE}; \
5194
				if [ -z "$$found" ] ; then	\
5195
					${ECHO_MSG} "Error: shared library \"$$lib\" was not installed"; \
5196
					exit 1; \
5197
				else	\
5198
					${ECHO_MSG} "Shared library \"$$lib\" duly installed ($$found)"; \
5180
				fi; \
5199
				fi; \
5181
			fi; \
5200
			fi; \
5182
		fi; \
5201
		fi; \
5183
	done
5202
	done

Return to bug 114167