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

Diff of /eclass/libtool.eclass

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

Revision 1.83 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.83 2009/05/03 20:03:10 loki_val 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 ...
77# 59#
78ELT_walk_patches() { 60ELT_walk_patches() {
79 local x= 61 local patch
80 local y=
81 local ret=1 62 local ret=1
82 local file=$1 63 local file=$1
83 local patch_set=$2 64 local patch_set=$2
84 local patch_dir= 65 local patch_dir="${ELT_PATCH_DIR}/${patch_set}"
85 local rem_int_dep=$3 66 local rem_int_dep=$3
86 67
87 if [[ -n ${patch_set} ]] ; then 68 [[ -z ${patch_set} ]] && return 1
88 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then 69 [[ ! -d ${patch_dir} ]] && return 1
89 patch_dir="${ELT_PATCH_DIR}/${patch_set}" 70
90 else 71 pushd "${ELT_PATCH_DIR}" >/dev/null
91 return "${ret}" 72
73 # Go through the patches in reverse order (newer version to older)
74 for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do
75 # For --remove-internal-dep ...
76 if [[ -n ${rem_int_dep} ]] ; then
77 # For replace @REM_INT_DEP@ with what was passed
78 # to --remove-internal-dep
79 local tmp="${T}/$$.rem_int_deps.patch"
80 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" "${patch}" > "${tmp}"
81 patch=${tmp}
92 fi 82 fi
93 83
94 # Go through the patches in reverse order (large to small)
95 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
96 if [[ -n ${x} && -f ${x} ]] ; then
97 # For --remove-internal-dep ...
98 if [[ -n ${rem_int_dep} ]] ; then
99 # For replace @REM_INT_DEP@ with what was passed
100 # to --remove-internal-dep
101 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
102 "${T}/$$.rem_int_deps.patch"
103
104 x="${T}/$$.rem_int_deps.patch"
105 fi
106
107 if ELT_try_and_apply_patch "${file}" "${x}" ; then 84 if ELT_try_and_apply_patch "${file}" "${patch}" ; then
85 # Break to unwind w/popd rather than return directly
108 ret=0 86 ret=0
109 break 87 break
110 fi
111 fi 88 fi
112 done 89 done
113 fi
114 90
91 popd >/dev/null
115 return "${ret}" 92 return ${ret}
116} 93}
117 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.
118elibtoolize() { 105elibtoolize() {
119 local x= 106 local x
120 local y=
121 local do_portage="no" 107 local do_portage="no"
122 local do_reversedeps="no" 108 local do_reversedeps="no"
123 local do_only_patches="no" 109 local do_only_patches="no"
124 local do_uclibc="yes" 110 local do_uclibc="yes"
125 local deptoremove= 111 local deptoremove=
126 local my_dirlist= 112 local do_shallow="no"
127 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"
128 local start_dir=${PWD}
129
130 my_dirlist=$(ELT_find_ltmain_sh)
131 114
132 for x in "$@" ; do 115 for x in "$@" ; do
133 case "${x}" in 116 case ${x} in
134 "--portage") 117 --portage)
135 # Only apply portage patch, and don't 118 # Only apply portage patch, and don't
136 # 'libtoolize --copy --force' if all patches fail. 119 # 'libtoolize --copy --force' if all patches fail.
137 do_portage="yes" 120 do_portage="yes"
138 ;; 121 ;;
139 "--reverse-deps") 122 --reverse-deps)
140 # Apply the reverse-deps patch 123 # Apply the reverse-deps patch
141 # http://bugzilla.gnome.org/show_bug.cgi?id=75635 124 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
142 do_reversedeps="yes" 125 do_reversedeps="yes"
143 elt_patches="${elt_patches} fix-relink" 126 elt_patches+=" fix-relink"
144 ;; 127 ;;
145 "--patch-only") 128 --patch-only)
146 # Do not run libtoolize if none of the patches apply .. 129 # Do not run libtoolize if none of the patches apply ..
147 do_only_patches="yes" 130 do_only_patches="yes"
148 ;; 131 ;;
149 "^--remove-internal-dep="*) 132 --remove-internal-dep=*)
150 # We will replace @REM_INT_DEP@ with what is needed 133 # We will replace @REM_INT_DEP@ with what is needed
151 # in ELT_walk_patches() ... 134 # in ELT_walk_patches() ...
152 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||') 135 deptoremove=${x#--remove-internal-dep=}
153 136
154 # Add the patch for this ... 137 # Add the patch for this ...
155 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep" 138 [[ -n ${deptoremove} ]] && elt_patches+=" rem-int-dep"
156 ;; 139 ;;
157 "--shallow") 140 --shallow)
158 # Only patch the ltmain.sh in ${S} 141 # Only patch the ltmain.sh in ${S}
159 if [[ -f ${S}/ltmain.sh ]] ; then 142 do_shallow="yes"
160 my_dirlist=${S}
161 else
162 my_dirlist=
163 fi
164 ;; 143 ;;
165 "--no-uclibc") 144 --no-uclibc)
166 do_uclibc="no" 145 do_uclibc="no"
167 ;; 146 ;;
168 *) 147 *)
169 eerror "Invalid elibtoolize option: ${x}" 148 eerror "Invalid elibtoolize option: ${x}"
170 die "elibtoolize called with ${x} ??" 149 die "elibtoolize called with ${x} ??"
171 esac 150 esac
172 done 151 done
173 152
174 [[ ${do_uclibc} == "yes" ]] && \ 153 [[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf"
175 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
176 154
177 [[ ${CHOST} == *"-freebsd"* ]] && \ 155 case ${CHOST} in
178 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf" 156 *-aix*) elt_patches+=" hardcode aixrtl aix-noundef" ;; #213277
157 *-darwin*) elt_patches+=" darwin-ltconf darwin-ltmain darwin-conf" ;;
158 *-freebsd*) elt_patches+=" fbsd-conf fbsd-ltconf" ;;
159 *-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" ;;
160 *-irix*) elt_patches+=" irix-ltmain" ;;
161 *-mint*) elt_patches+=" mint-conf" ;;
162 esac
179 163
180 [[ ${CHOST} == *"-darwin"* ]] && \ 164 # Reuse "$@" for dirs to patch
181 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain" 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
182 171
183 for x in ${my_dirlist} ; do 172 local d p
184 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 173 for d in "$@" ; do
185 export ELT_APPLIED_PATCHES= 174 export ELT_APPLIED_PATCHES=
186 export ELT_LTMAIN_SH="${x}/ltmain.sh"
187 175
188 [[ -f ${x}/.elibtoolized ]] && continue 176 [[ -f ${d}/.elibtoolized ]] && continue
189 177
190 cd ${x} 178 einfo "Running elibtoolize in: ${d#${WORKDIR}/}/"
191 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
192 179
193 for y in ${elt_patches} ; do 180 for p in ${elt_patches} ; do
194 local ret=0 181 local ret=0
195 182
196 case "${y}" in 183 case ${p} in
197 "portage") 184 portage)
198 # Stupid test to see if its already applied ... 185 # Stupid test to see if its already applied ...
199 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
200 ELT_walk_patches "${x}/ltmain.sh" "${y}" 187 ELT_walk_patches "${d}/ltmain.sh" "${p}"
201 ret=$? 188 ret=$?
202 fi 189 fi
203 ;; 190 ;;
204 "rem-int-dep") 191 rem-int-dep)
205 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 192 ELT_walk_patches "${d}/ltmain.sh" "${p}" "${deptoremove}"
206 ret=$? 193 ret=$?
207 ;; 194 ;;
208 "fix-relink") 195 fix-relink)
209 # 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 ...
210 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 197 if grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" ; then
211 ELT_walk_patches "${x}/ltmain.sh" "${y}" 198 ELT_walk_patches "${d}/ltmain.sh" "${p}"
212 ret=$? 199 ret=$?
213 fi 200 fi
214 ;; 201 ;;
215 "max_cmd_len") 202 max_cmd_len)
216 # Do not apply if $max_cmd_len is not used ... 203 # Do not apply if $max_cmd_len is not used ...
217 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 204 if grep -qs 'max_cmd_len' "${d}/ltmain.sh" ; then
218 ELT_walk_patches "${x}/ltmain.sh" "${y}" 205 ELT_walk_patches "${d}/ltmain.sh" "${p}"
219 ret=$? 206 ret=$?
220 fi 207 fi
221 ;; 208 ;;
222 "as-needed") 209 as-needed)
223 ELT_walk_patches "${x}/ltmain.sh" "${y}" 210 ELT_walk_patches "${d}/ltmain.sh" "${p}"
224 ret=$? 211 ret=$?
225 ;; 212 ;;
226 "uclibc-conf") 213 uclibc-conf)
227 if [[ -e ${x}/configure && \
228 -n $(grep 'Transform linux' "${x}/configure") ]] ; then 214 if grep -qs 'Transform linux' "${d}/configure" ; then
229 ELT_walk_patches "${x}/configure" "${y}" 215 ELT_walk_patches "${d}/configure" "${p}"
230 ret=$? 216 ret=$?
231 # ltmain.sh and co might be in a subdirectory ... 217 # ltmain.sh and co might be in a subdirectory ...
232 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ 218 elif [[ ! -e ${d}/configure ]] && \
233 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then 219 grep -qs 'Transform linux' "${d}/../configure" ; then
234 ELT_walk_patches "${x}/../configure" "${y}" 220 ELT_walk_patches "${d}/../configure" "${p}"
235 ret=$? 221 ret=$?
236 fi 222 fi
237 ;; 223 ;;
238 "uclibc-ltconf") 224 uclibc-ltconf)
239 # Newer libtoolize clears ltconfig, as not used anymore 225 # Newer libtoolize clears ltconfig, as not used anymore
240 if [[ -s ${x}/ltconfig ]] ; then 226 if [[ -s ${d}/ltconfig ]] ; then
241 ELT_walk_patches "${x}/ltconfig" "${y}" 227 ELT_walk_patches "${d}/ltconfig" "${p}"
242 ret=$? 228 ret=$?
243 fi 229 fi
244 ;; 230 ;;
245 "fbsd-conf") 231 fbsd-conf)
246 if [[ -e ${x}/configure && \
247 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then 232 if grep -qs 'version_type=freebsd-' "${d}/configure" ; then
248 ELT_walk_patches "${x}/configure" "${y}" 233 ELT_walk_patches "${d}/configure" "${p}"
249 ret=$? 234 ret=$?
250 # ltmain.sh and co might be in a subdirectory ... 235 # ltmain.sh and co might be in a subdirectory ...
251 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ 236 elif [[ ! -e ${d}/configure ]] && \
252 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then 237 grep -qs 'version_type=freebsd-' "${d}/../configure" ; then
253 ELT_walk_patches "${x}/../configure" "${y}" 238 ELT_walk_patches "${d}/../configure" "${p}"
254 ret=$? 239 ret=$?
255 fi 240 fi
256 ;; 241 ;;
257 "fbsd-ltconf") 242 fbsd-ltconf)
258 if [[ -s ${x}/ltconfig ]] ; then 243 if [[ -s ${d}/ltconfig ]] ; then
259 ELT_walk_patches "${x}/ltconfig" "${y}" 244 ELT_walk_patches "${d}/ltconfig" "${p}"
260 ret=$? 245 ret=$?
261 fi 246 fi
262 ;; 247 ;;
248 darwin-conf)
249 if grep -qs '&& echo \.so ||' "${d}/configure" ; then
250 ELT_walk_patches "${d}/configure" "${p}"
251 ret=$?
252 # ltmain.sh and co might be in a subdirectory ...
253 elif [[ ! -e ${d}/configure ]] && \
254 grep -qs '&& echo \.so ||' "${d}/../configure" ; then
255 ELT_walk_patches "${d}/../configure" "${p}"
256 ret=$?
257 fi
258 ;;
263 "darwin-ltconf") 259 darwin-ltconf)
264 # Newer libtoolize clears ltconfig, as not used anymore 260 # Newer libtoolize clears ltconfig, as not used anymore
265 if [[ -s ${x}/ltconfig ]] ; then 261 if [[ -s ${d}/ltconfig ]] ; then
266 ELT_walk_patches "${x}/ltconfig" "${y}" 262 ELT_walk_patches "${d}/ltconfig" "${p}"
263 ret=$?
264 fi
265 ;;
266 darwin-ltmain)
267 # special case to avoid false positives (failing to apply
268 # ltmain.sh path message), newer libtools have this patch
269 # built in, so not much to patch around then
270 if [[ -e ${d}/ltmain.sh ]] && \
271 ! grep -qs 'verstring="-compatibility_version' "${d}/ltmain.sh" ; then
272 ELT_walk_patches "${d}/ltmain.sh" "${p}"
273 ret=$?
274 fi
275 ;;
276 aixrtl|hpux-conf)
277 ret=1
278 local subret=0
279 # apply multiple patches as often as they match
280 while [[ $subret -eq 0 ]]; do
281 subret=1
282 if [[ -e ${d}/configure ]]; then
283 ELT_walk_patches "${d}/configure" "${p}"
267 ret=$? 284 subret=$?
285 # ltmain.sh and co might be in a subdirectory ...
286 elif [[ ! -e ${d}/configure && -e ${d}/../configure ]] ; then
287 ELT_walk_patches "${d}/../configure" "${p}"
288 subret=$?
268 fi 289 fi
290 if [[ $subret -eq 0 ]]; then
291 # have at least one patch succeeded.
292 ret=0
293 fi
294 done
269 ;; 295 ;;
296 mint-conf)
297 ret=1
298 local subret=1
299 if [[ -e ${d}/configure ]]; then
300 ELT_walk_patches "${d}/configure" "${p}"
301 subret=$?
302 # ltmain.sh and co might be in a subdirectory ...
303 elif [[ ! -e ${d}/configure && -e ${d}/../configure ]] ; then
304 ELT_walk_patches "${d}/../configure" "${p}"
305 subret=$?
306 fi
307 if [[ $subret -eq 0 ]]; then
308 # have at least one patch succeeded.
309 ret=0
310 fi
311 ;;
270 "install-sh") 312 install-sh)
271 ELT_walk_patches "${x}/install-sh" "${y}" 313 ELT_walk_patches "${d}/install-sh" "${p}"
272 ret=$? 314 ret=$?
273 ;; 315 ;;
274 "cross") 316 cross)
275 if tc-is-cross-compiler ; then 317 if tc-is-cross-compiler ; then
276 ELT_walk_patches "${x}/ltmain.sh" "${y}" 318 ELT_walk_patches "${d}/ltmain.sh" "${p}"
277 ret=$? 319 ret=$?
278 fi 320 fi
279 ;; 321 ;;
280 *) 322 *)
281 ELT_walk_patches "${x}/ltmain.sh" "${y}" 323 ELT_walk_patches "${d}/ltmain.sh" "${p}"
282 ret=$? 324 ret=$?
283 ;; 325 ;;
284 esac 326 esac
285 327
286 if [[ ${ret} -ne 0 ]] ; then 328 if [[ ${ret} -ne 0 ]] ; then
287 case ${y} in 329 case ${p} in
288 "relink") 330 relink)
289 local version=$(ELT_libtool_version "${x}/ltmain.sh") 331 local version=$(ELT_libtool_version "${d}/ltmain.sh")
290 # Critical patch, but could be applied ... 332 # Critical patch, but could be applied ...
291 # FIXME: Still need a patch for ltmain.sh > 1.4.0 333 # FIXME: Still need a patch for ltmain.sh > 1.4.0
292 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \ 334 if ! grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" && \
293 $(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
294 ewarn " Could not apply relink.patch!" 336 ewarn " Could not apply relink.patch!"
295 fi 337 fi
296 ;; 338 ;;
297 "portage") 339 portage)
298 # Critical patch - for this one we abort, as it can really 340 # Critical patch - for this one we abort, as it can really
299 # cause breakage without it applied! 341 # cause breakage without it applied!
300 if [[ ${do_portage} == "yes" ]] ; then 342 if [[ ${do_portage} == "yes" ]] ; then
301 # Stupid test to see if its already applied ... 343 # Stupid test to see if its already applied ...
302 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
303 echo 345 echo
304 eerror "Portage patch requested, but failed to apply!" 346 eerror "Portage patch requested, but failed to apply!"
305 eerror "Please bug azarah or vapier to add proper patch." 347 eerror "Please file a bug report to add a proper patch."
306 die "Portage patch requested, but failed to apply!" 348 die "Portage patch requested, but failed to apply!"
307 fi 349 fi
308 else 350 else
309 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
310 # ewarn " Portage patch seems to be already applied." 352 # ewarn " Portage patch seems to be already applied."
311 # ewarn " Please verify that it is not needed." 353 # ewarn " Please verify that it is not needed."
312 : 354 :
313 else 355 else
314 local version=$( \ 356 local version=$(ELT_libtool_version "${d}"/ltmain.sh)
315 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
316 echo "${VERSION}")
317
318 echo 357 echo
319 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 358 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
320 eerror "Please bug azarah or vapier to add proper patch." 359 eerror "Please file a bug report to add a proper patch."
321 die "Portage patch failed to apply!" 360 die "Portage patch failed to apply!"
322 fi 361 fi
323 # We do not want to run libtoolize ... 362 # We do not want to run libtoolize ...
324 ELT_APPLIED_PATCHES="portage" 363 ELT_APPLIED_PATCHES="portage"
325 fi 364 fi
326 ;; 365 ;;
327 "uclibc-"*) 366 uclibc-*)
328 [[ ${CHOST} == *"-uclibc" ]] && \
329 ewarn " uClibc patch set '${y}' failed to apply!" 367 [[ ${CHOST} == *-uclibc ]] && ewarn " uClibc patch set '${p}' failed to apply!"
330 ;; 368 ;;
331 "fbsd-"*) 369 fbsd-*)
332 if [[ ${CHOST} == *"-freebsd"* ]] ; then 370 if [[ ${CHOST} == *-freebsd* ]] ; then
333 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \ 371 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
334 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then 372 "${d}/configure" "${d}/../configure" 2>/dev/null) ]]; then
335 eerror " FreeBSD patch set '${y}' failed to apply!" 373 eerror " FreeBSD patch set '${p}' failed to apply!"
336 die "FreeBSD patch set '${y}' failed to apply!" 374 die "FreeBSD patch set '${p}' failed to apply!"
337 fi 375 fi
338 fi 376 fi
339 ;; 377 ;;
340 "darwin-"*) 378 darwin-*)
341 [[ ${CHOST} == *"-darwin"* ]] && \
342 ewarn " Darwin patch set '${y}' failed to apply!" 379 [[ ${CHOST} == *"-darwin"* ]] && ewarn " Darwin patch set '${p}' failed to apply!"
343 ;; 380 ;;
344 esac 381 esac
345 fi 382 fi
346 done 383 done
347 384
354 ewarn "Cannot apply any patches, please file a bug about this" 391 ewarn "Cannot apply any patches, please file a bug about this"
355 die 392 die
356 fi 393 fi
357 fi 394 fi
358 395
359 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 396 rm -f "${d}/libtool"
360 397
361 >> "${x}/.elibtoolized" 398 > "${d}/.elibtoolized"
362 done 399 done
363
364 cd "${start_dir}"
365} 400}
366 401
367uclibctoolize() { 402uclibctoolize() { die "Use elibtoolize"; }
368 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!" 403darwintoolize() { die "Use elibtoolize"; }
369 elibtoolize
370}
371
372darwintoolize() {
373 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
374 elibtoolize
375}
376 404
377# char *VER_major(string) 405# char *VER_major(string)
378# 406#
379# Return the Major (X of X.Y.Z) version 407# Return the Major (X of X.Y.Z) version
380# 408#

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

  ViewVC Help
Powered by ViewVC 1.1.20