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

(-)b/Mk/Scripts/do-depends.sh (-15 / +26 lines)
Lines 92-98 find_lib() Link Here
92
}
92
}
93
93
94
anynotfound=0
94
anynotfound=0
95
err=0
95
err=""
96
ecnt=0
96
for _line in ${dp_RAWDEPENDS} ; do
97
for _line in ${dp_RAWDEPENDS} ; do
97
	# ensure we never leak flavors
98
	# ensure we never leak flavors
98
	unset FLAVOR
99
	unset FLAVOR
Lines 101-110 for _line in ${dp_RAWDEPENDS} ; do Link Here
101
	set -- ${_line}
102
	set -- ${_line}
102
	IFS=${myifs}
103
	IFS=${myifs}
103
	if [ $# -lt 2 -o $# -gt 3 ]; then
104
	if [ $# -lt 2 -o $# -gt 3 ]; then
104
		echo "Error: bad dependency syntax in ${dp_DEPTYPE}" >&2
105
                ecnt=$((${ecnt} + 1))
105
		echo "expecting: pattern:origin[@flavour][:target]" >&2
106
		_el1="Error #${ecnt}: bad dependency syntax in ${dp_DEPTYPE}\n"
106
		echo "got: ${_line}" >&2
107
		_el2="         expecting: pattern:origin[@flavour][:target]\n"
107
		err=1
108
		_el3="         got: ${_line}\n"
109
		printf "${_el1}${_el2}${_el3}" >&2
110
		err="${err}\t${_el1}\t${_el2}\t${_el3}"
108
		continue
111
		continue
109
	fi
112
	fi
110
	pattern=$1
113
	pattern=$1
Lines 112-125 for _line in ${dp_RAWDEPENDS} ; do Link Here
112
	last=${3:-}
115
	last=${3:-}
113
116
114
	if [ -z "${pattern}" ]; then
117
	if [ -z "${pattern}" ]; then
115
		echo "Error: there is an empty port dependency in ${dp_DEPTYPE}" >&2
118
                ecnt=$((${ecnt} + 1))
116
		err=1
119
		_err="Error #${ecnt}: there is an empty port dependency in ${dp_DEPTYPE}\n"
120
		printf "${_err}" >&2
121
		err="${err}\t${_err}"
117
		continue
122
		continue
118
	fi
123
	fi
119
124
120
	if [ -z "${origin}" ]; then
125
	if [ -z "${origin}" ]; then
121
		echo "Error: a dependency has an empty origin in ${dp_DEPTYPE}" >&2
126
                ecnt=$((${ecnt} + 1))
122
		err=1
127
		_err="Error #${ecnt}: a dependency has an empty origin in ${dp_DEPTYPE}\n"
128
		printf "${_err}" >&2
129
		err="${err}\t${_err}"
123
		continue
130
		continue
124
	fi
131
	fi
125
132
Lines 169-176 for _line in ${dp_RAWDEPENDS} ; do Link Here
169
	    case ${pattern} in
176
	    case ${pattern} in
170
	      lib*.so*)      fct=find_lib ;;
177
	      lib*.so*)      fct=find_lib ;;
171
	      *)
178
	      *)
172
		echo "Error: pattern ${pattern} in LIB_DEPENDS is not valid"
179
                ecnt=$((${ecnt} + 1))
173
		err=1
180
		_err="Error #${ecnt}: pattern ${pattern} in LIB_DEPENDS is not valid\n"
181
		printf "${_err}" >&2
182
		err="${err}\t${_err}"
174
		continue
183
		continue
175
		;;
184
		;;
176
	    esac ;;
185
	    esac ;;
Lines 188-195 for _line in ${dp_RAWDEPENDS} ; do Link Here
188
	[ ${pattern} = "/nonexistent" ] || anynotfound=1
197
	[ ${pattern} = "/nonexistent" ] || anynotfound=1
189
198
190
	if [ ! -f "${origin}/Makefile" ]; then
199
	if [ ! -f "${origin}/Makefile" ]; then
191
		echo "Error a dependency refers to a non existing origin: ${origin} in ${dp_DEPTYPE}" >&2
200
                ecnt=$((${ecnt} + 1))
192
		err=1
201
		_err="Error #${ecnt}: a dependency refers to a non existing origin: ${origin} in ${dp_DEPTYPE}\n"
202
		printf "${_err}" >&2
203
		err="${err}\t${_err}"
193
		continue
204
		continue
194
	fi
205
	fi
195
206
Lines 200-207 for _line in ${dp_RAWDEPENDS} ; do Link Here
200
	echo "===>   Returning to build of ${dp_PKGNAME}"
211
	echo "===>   Returning to build of ${dp_PKGNAME}"
201
done
212
done
202
213
203
if [ $err -eq 1 ]; then
214
if [ $ecnt -ne 0 ]; then
204
	echo "Errors with dependencies."
215
	printf "Found ${ecnt} error(s) with dependencies:\n${err}"
205
	exit 1
216
	exit 1
206
fi
217
fi
207
218

Return to bug 257069