/[gentoo-x86]/eclass/libtool.eclass
Gentoo

Diff of /eclass/libtool.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.89 Revision 1.90
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2010 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.89 2010/05/20 08:22:15 haubi Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.90 2010/08/22 22:44:45 vapier Exp $
4# 4
5# @ECLASS: libtool.eclass
6# @MAINTAINER:
5# Maintainer: base-system@gentoo.org 7# base-system@gentoo.org
6# 8# @BLURB: quickly update bundled libtool code
9# @DESCRIPTION:
7# This eclass patches ltmain.sh distributed with libtoolized packages with the 10# This eclass patches ltmain.sh distributed with libtoolized packages with the
8# relink and portage patch among others 11# relink and portage patch among others
9# 12#
10# Note, this eclass does not require libtool as it only applies patches to 13# Note, this eclass does not require libtool as it only applies patches to
11# generated libtool files. We do not run the libtoolize program because that 14# generated libtool files. We do not run the libtoolize program because that
12# requires a regeneration of the main autotool files in order to work properly. 15# requires a regeneration of the main autotool files in order to work properly.
13 16
14DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
15 18
16ELIBTOOL_VERSION="2.0.2"
17
18inherit toolchain-funcs 19inherit toolchain-funcs
19 20
20ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches" 21ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
21ELT_APPLIED_PATCHES=
22ELT_LTMAIN_SH=
23
24#
25# Returns all the directories containing ltmain.sh
26#
27ELT_find_ltmain_sh() {
28 local x=
29 local dirlist=
30
31 for x in $(find "${S}" -name 'ltmain.sh') ; do
32 dirlist="${dirlist} ${x%/*}"
33 done
34
35 echo "${dirlist}"
36}
37 22
38# 23#
39# See if we can apply $2 on $1, and if so, do it 24# See if we can apply $2 on $1, and if so, do it
40# 25#
41ELT_try_and_apply_patch() { 26ELT_try_and_apply_patch() {
59 44
60# 45#
61# Get string version of ltmain.sh or ltconfig (passed as $1) 46# Get string version of ltmain.sh or ltconfig (passed as $1)
62# 47#
63ELT_libtool_version() { 48ELT_libtool_version() {
64 local ltmain_sh=$1 49 (
65 local version= 50 unset VERSION
66
67 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \ 51 eval $(grep -e '^[[:space:]]*VERSION=' "$1")
68 echo "${VERSION}") 52 echo "${VERSION:-0}"
69 [[ -z ${version} ]] && version="0" 53 )
70
71 echo "${version}"
72} 54}
73 55
74# 56#
75# Run through the patches in $2 and see if any 57# Run through the patches in $2 and see if any
76# apply to $1 ... 58# apply to $1 ...
108 90
109 popd >/dev/null 91 popd >/dev/null
110 return ${ret} 92 return ${ret}
111} 93}
112 94
95# @FUNCTION: elibtoolize
96# @USAGE: [dirs] [--portage] [--reverse-deps] [--patch-only] [--remove-internal-dep=xxx] [--shallow] [--no-uclibc]
97# @DESCRIPTION:
98# Apply a smorgasbord of patches to bundled libtool files. This function
99# should always be safe to run. If no directories are specified, then
100# ${S} will be searched for appropriate files.
101#
102# If the --shallow option is used, then only ${S}/ltmain.sh will be patched.
103#
104# The other options should be avoided in general unless you know what's going on.
113elibtoolize() { 105elibtoolize() {
114 local x= 106 local x
115 local y=
116 local do_portage="no" 107 local do_portage="no"
117 local do_reversedeps="no" 108 local do_reversedeps="no"
118 local do_only_patches="no" 109 local do_only_patches="no"
119 local do_uclibc="yes" 110 local do_uclibc="yes"
120 local deptoremove= 111 local deptoremove=
121 local my_dirlist= 112 local do_shallow="no"
122 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed" 113 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
123 local start_dir=${PWD}
124
125 my_dirlist=$(ELT_find_ltmain_sh)
126 114
127 for x in "$@" ; do 115 for x in "$@" ; do
128 case "${x}" in 116 case ${x} in
129 "--portage") 117 --portage)
130 # Only apply portage patch, and don't 118 # Only apply portage patch, and don't
131 # 'libtoolize --copy --force' if all patches fail. 119 # 'libtoolize --copy --force' if all patches fail.
132 do_portage="yes" 120 do_portage="yes"
133 ;; 121 ;;
134 "--reverse-deps") 122 --reverse-deps)
135 # Apply the reverse-deps patch 123 # Apply the reverse-deps patch
136 # http://bugzilla.gnome.org/show_bug.cgi?id=75635 124 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
137 do_reversedeps="yes" 125 do_reversedeps="yes"
138 elt_patches="${elt_patches} fix-relink" 126 elt_patches+=" fix-relink"
139 ;; 127 ;;
140 "--patch-only") 128 --patch-only)
141 # Do not run libtoolize if none of the patches apply .. 129 # Do not run libtoolize if none of the patches apply ..
142 do_only_patches="yes" 130 do_only_patches="yes"
143 ;; 131 ;;
144 "^--remove-internal-dep="*) 132 --remove-internal-dep=*)
145 # We will replace @REM_INT_DEP@ with what is needed 133 # We will replace @REM_INT_DEP@ with what is needed
146 # in ELT_walk_patches() ... 134 # in ELT_walk_patches() ...
147 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||') 135 deptoremove=${x#--remove-internal-dep=}
148 136
149 # Add the patch for this ... 137 # Add the patch for this ...
150 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep" 138 [[ -n ${deptoremove} ]] && elt_patches+=" rem-int-dep"
151 ;; 139 ;;
152 "--shallow") 140 --shallow)
153 # Only patch the ltmain.sh in ${S} 141 # Only patch the ltmain.sh in ${S}
154 if [[ -f ${S}/ltmain.sh ]] ; then 142 do_shallow="yes"
155 my_dirlist=${S}
156 else
157 my_dirlist=
158 fi
159 ;; 143 ;;
160 "--no-uclibc") 144 --no-uclibc)
161 do_uclibc="no" 145 do_uclibc="no"
162 ;; 146 ;;
163 *) 147 *)
164 eerror "Invalid elibtoolize option: ${x}" 148 eerror "Invalid elibtoolize option: ${x}"
165 die "elibtoolize called with ${x} ??" 149 die "elibtoolize called with ${x} ??"
166 esac 150 esac
167 done 151 done
168 152
169 [[ ${do_uclibc} == "yes" ]] && \ 153 [[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf"
170 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
171 154
172 case "${CHOST}" in 155 case ${CHOST} in
173 *-aix*) # see bug #213277 156 *-aix*) elt_patches+=" hardcode aixrtl aix-noundef" ;; #213277
174 elt_patches="${elt_patches} hardcode aixrtl aix-noundef"
175 ;;
176 *-darwin*)
177 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain darwin-conf" 157 *-darwin*) elt_patches+=" darwin-ltconf darwin-ltmain darwin-conf" ;;
178 ;; 158 *-freebsd*) elt_patches+=" fbsd-conf fbsd-ltconf" ;;
179 *-freebsd*)
180 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
181 ;;
182 *-hpux*)
183 elt_patches="${elt_patches} hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" 159 *-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" ;;
184 ;; 160 *-irix*) elt_patches+=" irix-ltmain" ;;
185 *-irix*) 161 *-mint*) elt_patches+=" mint-conf" ;;
186 elt_patches="${elt_patches} irix-ltmain"
187 ;;
188 *-mint*)
189 elt_patches="${elt_patches} mint-conf"
190 ;;
191 esac 162 esac
192 163
193 for x in ${my_dirlist} ; do 164 # Reuse "$@" for dirs to patch
194 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 165 set --
166 if [[ ${do_shallow} == "yes" ]] ; then
167 [[ -f ${S}/ltmain.sh ]] && set -- "${S}"
168 else
169 set -- $(find "${S}" -name ltmain.sh -printf '%h ')
170 fi
171
172 local d p
173 for d in "$@" ; do
195 export ELT_APPLIED_PATCHES= 174 export ELT_APPLIED_PATCHES=
196 export ELT_LTMAIN_SH="${x}/ltmain.sh"
197 175
198 [[ -f ${x}/.elibtoolized ]] && continue 176 [[ -f ${d}/.elibtoolized ]] && continue
199 177
200 cd ${x} 178 einfo "Running elibtoolize in: ${d#${WORKDIR}/}/"
201 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
202 179
203 for y in ${elt_patches} ; do 180 for p in ${elt_patches} ; do
204 local ret=0 181 local ret=0
205 182
206 case "${y}" in 183 case ${p} in
207 "portage") 184 portage)
208 # Stupid test to see if its already applied ... 185 # Stupid test to see if its already applied ...
209 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 186 if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
210 ELT_walk_patches "${x}/ltmain.sh" "${y}" 187 ELT_walk_patches "${d}/ltmain.sh" "${p}"
211 ret=$? 188 ret=$?
212 fi 189 fi
213 ;; 190 ;;
214 "rem-int-dep") 191 rem-int-dep)
215 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 192 ELT_walk_patches "${d}/ltmain.sh" "${p}" "${deptoremove}"
216 ret=$? 193 ret=$?
217 ;; 194 ;;
218 "fix-relink") 195 fix-relink)
219 # Do not apply if we do not have the relink patch applied ... 196 # Do not apply if we do not have the relink patch applied ...
220 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 197 if grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" ; then
221 ELT_walk_patches "${x}/ltmain.sh" "${y}" 198 ELT_walk_patches "${d}/ltmain.sh" "${p}"
222 ret=$? 199 ret=$?
223 fi 200 fi
224 ;; 201 ;;
225 "max_cmd_len") 202 max_cmd_len)
226 # Do not apply if $max_cmd_len is not used ... 203 # Do not apply if $max_cmd_len is not used ...
227 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 204 if grep -qs 'max_cmd_len' "${d}/ltmain.sh" ; then
228 ELT_walk_patches "${x}/ltmain.sh" "${y}" 205 ELT_walk_patches "${d}/ltmain.sh" "${p}"
229 ret=$? 206 ret=$?
230 fi 207 fi
231 ;; 208 ;;
232 "as-needed") 209 as-needed)
233 ELT_walk_patches "${x}/ltmain.sh" "${y}" 210 ELT_walk_patches "${d}/ltmain.sh" "${p}"
234 ret=$? 211 ret=$?
235 ;; 212 ;;
236 "uclibc-conf") 213 uclibc-conf)
237 if [[ -e ${x}/configure && \
238 -n $(grep 'Transform linux' "${x}/configure") ]] ; then 214 if grep -qs 'Transform linux' "${d}/configure" ; then
239 ELT_walk_patches "${x}/configure" "${y}" 215 ELT_walk_patches "${d}/configure" "${p}"
240 ret=$? 216 ret=$?
241 # ltmain.sh and co might be in a subdirectory ... 217 # ltmain.sh and co might be in a subdirectory ...
242 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ 218 elif [[ ! -e ${d}/configure ]] && \
243 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then 219 grep -qs 'Transform linux' "${d}/../configure" ; then
244 ELT_walk_patches "${x}/../configure" "${y}" 220 ELT_walk_patches "${d}/../configure" "${p}"
245 ret=$? 221 ret=$?
246 fi 222 fi
247 ;; 223 ;;
248 "uclibc-ltconf") 224 uclibc-ltconf)
249 # Newer libtoolize clears ltconfig, as not used anymore 225 # Newer libtoolize clears ltconfig, as not used anymore
250 if [[ -s ${x}/ltconfig ]] ; then 226 if [[ -s ${d}/ltconfig ]] ; then
251 ELT_walk_patches "${x}/ltconfig" "${y}" 227 ELT_walk_patches "${d}/ltconfig" "${p}"
252 ret=$? 228 ret=$?
253 fi 229 fi
254 ;; 230 ;;
255 "fbsd-conf") 231 fbsd-conf)
256 if [[ -e ${x}/configure && \
257 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then 232 if grep -qs 'version_type=freebsd-' "${d}/configure" ; then
258 ELT_walk_patches "${x}/configure" "${y}" 233 ELT_walk_patches "${d}/configure" "${p}"
259 ret=$? 234 ret=$?
260 # ltmain.sh and co might be in a subdirectory ... 235 # ltmain.sh and co might be in a subdirectory ...
261 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ 236 elif [[ ! -e ${d}/configure ]] && \
262 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then 237 grep -qs 'version_type=freebsd-' "${d}/../configure" ; then
263 ELT_walk_patches "${x}/../configure" "${y}" 238 ELT_walk_patches "${d}/../configure" "${p}"
264 ret=$? 239 ret=$?
265 fi 240 fi
266 ;; 241 ;;
267 "fbsd-ltconf") 242 fbsd-ltconf)
268 if [[ -s ${x}/ltconfig ]] ; then 243 if [[ -s ${d}/ltconfig ]] ; then
269 ELT_walk_patches "${x}/ltconfig" "${y}" 244 ELT_walk_patches "${d}/ltconfig" "${p}"
270 ret=$? 245 ret=$?
271 fi 246 fi
272 ;; 247 ;;
273 "darwin-conf") 248 darwin-conf)
274 if [[ -e ${x}/configure && \
275 -n $(grep '&& echo \.so ||' "${x}/configure") ]] ; then 249 if grep -qs '&& echo \.so ||' "${d}/configure" ; then
276 ELT_walk_patches "${x}/configure" "${y}" 250 ELT_walk_patches "${d}/configure" "${p}"
277 ret=$? 251 ret=$?
278 # ltmain.sh and co might be in a subdirectory ... 252 # ltmain.sh and co might be in a subdirectory ...
279 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ 253 elif [[ ! -e ${d}/configure ]] && \
280 -n $(grep '&& echo \.so ||' "${x}/../configure") ]] ; then 254 grep -qs '&& echo \.so ||' "${d}/../configure" ; then
281 ELT_walk_patches "${x}/../configure" "${y}" 255 ELT_walk_patches "${d}/../configure" "${p}"
282 ret=$? 256 ret=$?
283 fi 257 fi
284 ;; 258 ;;
285 "darwin-ltconf") 259 darwin-ltconf)
286 # Newer libtoolize clears ltconfig, as not used anymore 260 # Newer libtoolize clears ltconfig, as not used anymore
287 if [[ -s ${x}/ltconfig ]] ; then 261 if [[ -s ${d}/ltconfig ]] ; then
288 ELT_walk_patches "${x}/ltconfig" "${y}" 262 ELT_walk_patches "${d}/ltconfig" "${p}"
289 ret=$? 263 ret=$?
290 fi 264 fi
291 ;; 265 ;;
292 "darwin-ltmain") 266 darwin-ltmain)
293 # special case to avoid false positives (failing to apply 267 # special case to avoid false positives (failing to apply
294 # ltmain.sh path message), newer libtools have this patch 268 # ltmain.sh path message), newer libtools have this patch
295 # built in, so not much to patch around then 269 # built in, so not much to patch around then
296 if [[ -e ${x}/ltmain.sh && \ 270 if [[ -e ${d}/ltmain.sh ]] && \
297 -z $(grep 'verstring="-compatibility_version' "${x}/ltmain.sh") ]] ; then 271 ! grep -qs 'verstring="-compatibility_version' "${d}/ltmain.sh" ; then
298 ELT_walk_patches "${x}/ltmain.sh" "${y}" 272 ELT_walk_patches "${d}/ltmain.sh" "${p}"
299 ret=$? 273 ret=$?
300 fi 274 fi
301 ;; 275 ;;
302 "aixrtl" | "hpux-conf") 276 aixrtl|hpux-conf)
303 ret=1 277 ret=1
304 local subret=0 278 local subret=0
305 # apply multiple patches as often as they match 279 # apply multiple patches as often as they match
306 while [[ $subret -eq 0 ]]; do 280 while [[ $subret -eq 0 ]]; do
307 subret=1 281 subret=1
308 if [[ -e ${x}/configure ]]; then 282 if [[ -e ${d}/configure ]]; then
309 ELT_walk_patches "${x}/configure" "${y}" 283 ELT_walk_patches "${d}/configure" "${p}"
310 subret=$? 284 subret=$?
311 # ltmain.sh and co might be in a subdirectory ... 285 # ltmain.sh and co might be in a subdirectory ...
312 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then 286 elif [[ ! -e ${d}/configure && -e ${d}/../configure ]] ; then
313 ELT_walk_patches "${x}/../configure" "${y}" 287 ELT_walk_patches "${d}/../configure" "${p}"
314 subret=$? 288 subret=$?
315 fi 289 fi
316 if [[ $subret -eq 0 ]]; then 290 if [[ $subret -eq 0 ]]; then
317 # have at least one patch succeeded. 291 # have at least one patch succeeded.
318 ret=0 292 ret=0
319 fi 293 fi
320 done 294 done
321 ;; 295 ;;
322 "mint-conf") 296 mint-conf)
323 ret=1 297 ret=1
324 local subret=1 298 local subret=1
325 if [[ -e ${x}/configure ]]; then 299 if [[ -e ${d}/configure ]]; then
326 ELT_walk_patches "${x}/configure" "${y}" 300 ELT_walk_patches "${d}/configure" "${p}"
327 subret=$? 301 subret=$?
328 # ltmain.sh and co might be in a subdirectory ... 302 # ltmain.sh and co might be in a subdirectory ...
329 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then 303 elif [[ ! -e ${d}/configure && -e ${d}/../configure ]] ; then
330 ELT_walk_patches "${x}/../configure" "${y}" 304 ELT_walk_patches "${d}/../configure" "${p}"
331 subret=$? 305 subret=$?
332 fi 306 fi
333 if [[ $subret -eq 0 ]]; then 307 if [[ $subret -eq 0 ]]; then
334 # have at least one patch succeeded. 308 # have at least one patch succeeded.
335 ret=0 309 ret=0
336 fi 310 fi
337 ;; 311 ;;
338 "install-sh") 312 install-sh)
339 ELT_walk_patches "${x}/install-sh" "${y}" 313 ELT_walk_patches "${d}/install-sh" "${p}"
340 ret=$? 314 ret=$?
341 ;; 315 ;;
342 "cross") 316 cross)
343 if tc-is-cross-compiler ; then 317 if tc-is-cross-compiler ; then
344 ELT_walk_patches "${x}/ltmain.sh" "${y}" 318 ELT_walk_patches "${d}/ltmain.sh" "${p}"
345 ret=$? 319 ret=$?
346 fi 320 fi
347 ;; 321 ;;
348 *) 322 *)
349 ELT_walk_patches "${x}/ltmain.sh" "${y}" 323 ELT_walk_patches "${d}/ltmain.sh" "${p}"
350 ret=$? 324 ret=$?
351 ;; 325 ;;
352 esac 326 esac
353 327
354 if [[ ${ret} -ne 0 ]] ; then 328 if [[ ${ret} -ne 0 ]] ; then
355 case ${y} in 329 case ${p} in
356 "relink") 330 relink)
357 local version=$(ELT_libtool_version "${x}/ltmain.sh") 331 local version=$(ELT_libtool_version "${d}/ltmain.sh")
358 # Critical patch, but could be applied ... 332 # Critical patch, but could be applied ...
359 # FIXME: Still need a patch for ltmain.sh > 1.4.0 333 # FIXME: Still need a patch for ltmain.sh > 1.4.0
360 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \ 334 if ! grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" && \
361 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then 335 [[ $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
362 ewarn " Could not apply relink.patch!" 336 ewarn " Could not apply relink.patch!"
363 fi 337 fi
364 ;; 338 ;;
365 "portage") 339 portage)
366 # Critical patch - for this one we abort, as it can really 340 # Critical patch - for this one we abort, as it can really
367 # cause breakage without it applied! 341 # cause breakage without it applied!
368 if [[ ${do_portage} == "yes" ]] ; then 342 if [[ ${do_portage} == "yes" ]] ; then
369 # Stupid test to see if its already applied ... 343 # Stupid test to see if its already applied ...
370 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 344 if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
371 echo 345 echo
372 eerror "Portage patch requested, but failed to apply!" 346 eerror "Portage patch requested, but failed to apply!"
373 eerror "Please file a bug report to add a proper patch." 347 eerror "Please file a bug report to add a proper patch."
374 die "Portage patch requested, but failed to apply!" 348 die "Portage patch requested, but failed to apply!"
375 fi 349 fi
376 else 350 else
377 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 351 if grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
378 # ewarn " Portage patch seems to be already applied." 352 # ewarn " Portage patch seems to be already applied."
379 # ewarn " Please verify that it is not needed." 353 # ewarn " Please verify that it is not needed."
380 : 354 :
381 else 355 else
382 local version=$( \ 356 local version=$(ELT_libtool_version "${d}"/ltmain.sh)
383 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
384 echo "${VERSION}")
385
386 echo 357 echo
387 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 358 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
388 eerror "Please file a bug report to add a proper patch." 359 eerror "Please file a bug report to add a proper patch."
389 die "Portage patch failed to apply!" 360 die "Portage patch failed to apply!"
390 fi 361 fi
391 # We do not want to run libtoolize ... 362 # We do not want to run libtoolize ...
392 ELT_APPLIED_PATCHES="portage" 363 ELT_APPLIED_PATCHES="portage"
393 fi 364 fi
394 ;; 365 ;;
395 "uclibc-"*) 366 uclibc-*)
396 [[ ${CHOST} == *"-uclibc" ]] && \
397 ewarn " uClibc patch set '${y}' failed to apply!" 367 [[ ${CHOST} == *-uclibc ]] && ewarn " uClibc patch set '${p}' failed to apply!"
398 ;; 368 ;;
399 "fbsd-"*) 369 fbsd-*)
400 if [[ ${CHOST} == *"-freebsd"* ]] ; then 370 if [[ ${CHOST} == *-freebsd* ]] ; then
401 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \ 371 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
402 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then 372 "${d}/configure" "${d}/../configure" 2>/dev/null) ]]; then
403 eerror " FreeBSD patch set '${y}' failed to apply!" 373 eerror " FreeBSD patch set '${p}' failed to apply!"
404 die "FreeBSD patch set '${y}' failed to apply!" 374 die "FreeBSD patch set '${p}' failed to apply!"
405 fi 375 fi
406 fi 376 fi
407 ;; 377 ;;
408 "darwin-"*) 378 darwin-*)
409 [[ ${CHOST} == *"-darwin"* ]] && \
410 ewarn " Darwin patch set '${y}' failed to apply!" 379 [[ ${CHOST} == *"-darwin"* ]] && ewarn " Darwin patch set '${p}' failed to apply!"
411 ;; 380 ;;
412 esac 381 esac
413 fi 382 fi
414 done 383 done
415 384
422 ewarn "Cannot apply any patches, please file a bug about this" 391 ewarn "Cannot apply any patches, please file a bug about this"
423 die 392 die
424 fi 393 fi
425 fi 394 fi
426 395
427 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 396 rm -f "${d}/libtool"
428 397
429 >> "${x}/.elibtoolized" 398 > "${d}/.elibtoolized"
430 done 399 done
431
432 cd "${start_dir}"
433} 400}
434 401
435uclibctoolize() { 402uclibctoolize() { die "Use elibtoolize"; }
436 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!" 403darwintoolize() { die "Use elibtoolize"; }
437 elibtoolize
438}
439
440darwintoolize() {
441 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
442 elibtoolize
443}
444 404
445# char *VER_major(string) 405# char *VER_major(string)
446# 406#
447# Return the Major (X of X.Y.Z) version 407# Return the Major (X of X.Y.Z) version
448# 408#

Legend:
Removed from v.1.89  
changed lines
  Added in v.1.90

  ViewVC Help
Powered by ViewVC 1.1.20