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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.86  
changed lines
  Added in v.1.92

  ViewVC Help
Powered by ViewVC 1.1.20