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

Diff of /eclass/libtool.eclass

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

Revision 1.54 Revision 1.55
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.54 2005/09/04 15:15:37 swegener Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.55 2005/09/04 18:40:48 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
127 uclibc-conf uclibc-ltconf" 127 uclibc-conf uclibc-ltconf"
128 local start_dir="${PWD}" 128 local start_dir="${PWD}"
129 129
130 my_dirlist="$(ELT_find_ltmain_sh)" 130 my_dirlist="$(ELT_find_ltmain_sh)"
131 131
132 [[ ${CHOST} == *"-freebsd"* ]] && \
133 elt_patches="${elt_patches} fbsd-conf"
134
132 for x in "$@" ; do 135 for x in "$@" ; do
133 case "${x}" in 136 case "${x}" in
134 "--portage") 137 "--portage")
135 # Only apply portage patch, and don't 138 # Only apply portage patch, and don't
136 # 'libtoolize --copy --force' if all patches fail. 139 # 'libtoolize --copy --force' if all patches fail.
224 fi 227 fi
225 ;; 228 ;;
226 "uclibc-ltconf") 229 "uclibc-ltconf")
227 if [[ -e ${x}/ltconfig ]] ; then 230 if [[ -e ${x}/ltconfig ]] ; then
228 ELT_walk_patches "${x}/ltconfig" "${y}" 231 ELT_walk_patches "${x}/ltconfig" "${y}"
232 ret=$?
233 fi
234 ;;
235 "fbsd-conf")
236 if [[ -e ${x}/configure ]] && \
237 grep 'version_type=freebsd-' "${x}/configure" > /dev/null ; then
238 ELT_walk_patches "${x}/configure" "${y}"
239 ret=$?
240 # ltmain.sh and co might be in a subdirectory ...
241 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] && \
242 grep 'version_type=freebsd-' "${x}/../configure" > /dev/null ; then
243 ELT_walk_patches "${x}/../configure" "${y}"
229 ret=$? 244 ret=$?
230 fi 245 fi
231 ;; 246 ;;
232 *) 247 *)
233 ELT_walk_patches "${x}/ltmain.sh" "${y}" 248 ELT_walk_patches "${x}/ltmain.sh" "${y}"
273 ;; 288 ;;
274 "uclibc-"*) 289 "uclibc-"*)
275 [[ ${CHOST} == *"-uclibc" ]] && \ 290 [[ ${CHOST} == *"-uclibc" ]] && \
276 ewarn " uClibc patch set '${y}' failed to apply!" 291 ewarn " uClibc patch set '${y}' failed to apply!"
277 ;; 292 ;;
293 "fbsd-"*)
294 [[ ${CHOST} == *"-freebsd"* ]] && \
295 eerror " FreeBSD patch set '${y}' failed to apply!"
296 die "FreeBSD patch set '${y}' failed to apply!"
297 ;;
278 esac 298 esac
279 fi 299 fi
280 done 300 done
281 301
282 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then 302 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then

Legend:
Removed from v.1.54  
changed lines
  Added in v.1.55

  ViewVC Help
Powered by ViewVC 1.1.20