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

Diff of /eclass/libtool.eclass

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

Revision 1.62 Revision 1.65
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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.62 2005/12/07 22:50:05 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.65 2006/03/30 12:29:23 flameeyes Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass patches ltmain.sh distributed with libtoolized packages with the 7# This eclass patches ltmain.sh distributed with libtoolized packages with the
8# relink and portage patch among others 8# relink and portage patch among others
215 215
216 for y in ${elt_patches} ; do 216 for y in ${elt_patches} ; do
217 local ret=0 217 local ret=0
218 218
219 case "${y}" in 219 case "${y}" in
220 "portage")
221 # Stupid test to see if its already applied ...
222 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
223 ELT_walk_patches "${x}/ltmain.sh" "${y}"
224 ret=$?
225 fi
226 ;;
220 "rem-int-dep") 227 "rem-int-dep")
221 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 228 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
222 ret=$? 229 ret=$?
223 ;; 230 ;;
224 "fix-relink") 231 "fix-relink")
296 if [[ ${do_portage} == "yes" ]] ; then 303 if [[ ${do_portage} == "yes" ]] ; then
297 # Stupid test to see if its already applied ... 304 # Stupid test to see if its already applied ...
298 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 305 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
299 echo 306 echo
300 eerror "Portage patch requested, but failed to apply!" 307 eerror "Portage patch requested, but failed to apply!"
308 eerror "Please bug azarah or vapier to add proper patch."
301 die "Portage patch requested, but failed to apply!" 309 die "Portage patch requested, but failed to apply!"
302 fi 310 fi
303 else 311 else
304 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 312 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
305 # ewarn " Portage patch seems to be already applied." 313 # ewarn " Portage patch seems to be already applied."
310 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \ 318 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
311 echo "${VERSION}") 319 echo "${VERSION}")
312 320
313 echo 321 echo
314 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 322 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
323 eerror "Please bug azarah or vapier to add proper patch."
315 die "Portage patch failed to apply!" 324 die "Portage patch failed to apply!"
316 fi 325 fi
317 # We do not want to run libtoolize ... 326 # We do not want to run libtoolize ...
318 ELT_APPLIED_PATCHES="portage" 327 ELT_APPLIED_PATCHES="portage"
319 fi 328 fi
322 [[ ${CHOST} == *"-uclibc" ]] && \ 331 [[ ${CHOST} == *"-uclibc" ]] && \
323 ewarn " uClibc patch set '${y}' failed to apply!" 332 ewarn " uClibc patch set '${y}' failed to apply!"
324 ;; 333 ;;
325 "fbsd-"*) 334 "fbsd-"*)
326 if [[ ${CHOST} == *"-freebsd"* ]] ; then 335 if [[ ${CHOST} == *"-freebsd"* ]] ; then
327 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' "${x}/configure") ]]; then 336 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
337 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
328 eerror " FreeBSD patch set '${y}' failed to apply!" 338 eerror " FreeBSD patch set '${y}' failed to apply!"
329 die "FreeBSD patch set '${y}' failed to apply!" 339 die "FreeBSD patch set '${y}' failed to apply!"
330 fi 340 fi
331 fi 341 fi
332 ;; 342 ;;

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.65

  ViewVC Help
Powered by ViewVC 1.1.20