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

Diff of /eclass/libtool.eclass

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

Revision 1.92 Revision 1.102
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2012 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.92 2011/06/10 10:14:21 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.102 2012/09/15 16:16:53 zmedico Exp $
4 4
5# @ECLASS: libtool.eclass 5# @ECLASS: libtool.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: quickly update bundled libtool code 8# @BLURB: quickly update bundled libtool code
12# 12#
13# 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
14# 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
15# 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.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17if [[ ${___ECLASS_ONCE_LIBTOOL} != "recur -_+^+_- spank" ]] ; then
18___ECLASS_ONCE_LIBTOOL="recur -_+^+_- spank"
18 19
20# If an overlay has eclass overrides, but doesn't actually override the
21# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's
22# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So
23# add a check to locate the ELT-patches/ regardless of what's going on.
24ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*}
25elt_patch_dir() {
26 local d="${ECLASSDIR}/ELT-patches"
27 if [[ ! -d ${d} ]] ; then
28 d="${ECLASSDIR_LOCAL}/ELT-patches"
29 fi
30 echo "${d}"
31}
32
19inherit toolchain-funcs 33inherit multilib toolchain-funcs
20
21ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
22 34
23# 35#
24# See if we can apply $2 on $1, and if so, do it 36# See if we can apply $2 on $1, and if so, do it
25# 37#
26ELT_try_and_apply_patch() { 38ELT_try_and_apply_patch() {
27 local ret=0 39 local ret=0
28 local file=$1 40 local file=$1
29 local patch=$2 41 local patch=$2
42 local src=$3
43 local disp="${src} patch"
44 local log="${T}/elibtool.log"
30 45
31 echo -e "\nTrying $(basename "$(dirname "${patch}")")-${patch##*/}.patch on ${file}" \ 46 if [[ -z ${__ELT_NOTED_TMP} ]] ; then
32 &>> "${T}/elibtool.log" 47 __ELT_NOTED_TMP=true
48 printf 'temp patch: %s\n' "${patch}" > "${log}"
49 fi
50 printf '\nTrying %s\n' "${disp}" >> "${log}"
33 51
34 # We only support patchlevel of 0 - why worry if its static patches? 52 # We only support patchlevel of 0 - why worry if its static patches?
35 if patch -p0 --dry-run "${file}" "${patch}" &>> "${T}/elibtool.log" ; then 53 if patch -p0 --dry-run "${file}" "${patch}" >> "${log}" 2>&1 ; then
36 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." 54 einfo " Applying ${disp} ..."
37 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \ 55 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" >> "${log}" 2>&1
38 &>> "${T}/elibtool.log"
39 ret=$? 56 ret=$?
40 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 57 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${src}"
41 else 58 else
42 ret=1 59 ret=1
43 fi 60 fi
44 61
45 return "${ret}" 62 return "${ret}"
59# 76#
60# Run through the patches in $2 and see if any 77# Run through the patches in $2 and see if any
61# apply to $1 ... 78# apply to $1 ...
62# 79#
63ELT_walk_patches() { 80ELT_walk_patches() {
64 local patch 81 local patch tmp
65 local ret=1 82 local ret=1
66 local file=$1 83 local file=$1
67 local patch_set=$2 84 local patch_set=$2
68 local patch_dir="${ELT_PATCH_DIR}/${patch_set}" 85 local patch_dir="$(elt_patch_dir)/${patch_set}"
69 local rem_int_dep=$3 86 local rem_int_dep=$3
70 87
71 [[ -z ${patch_set} ]] && return 1 88 [[ -z ${patch_set} ]] && return 1
72 [[ ! -d ${patch_dir} ]] && return 1 89 [[ ! -d ${patch_dir} ]] && return 1
73 90
74 pushd "${ELT_PATCH_DIR}" >/dev/null 91 # Allow patches to use @GENTOO_LIBDIR@ replacements
92 local sed_args=( -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" )
93 if [[ -n ${rem_int_dep} ]] ; then
94 # replace @REM_INT_DEP@ with what was passed
95 # to --remove-internal-dep
96 sed_args+=( -e "s|@REM_INT_DEP@|${rem_int_dep}|g" )
97 fi
98
99 pushd "$(elt_patch_dir)" >/dev/null || die
75 100
76 # Go through the patches in reverse order (newer version to older) 101 # Go through the patches in reverse order (newer version to older)
77 for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do 102 for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do
78 # For --remove-internal-dep ... 103 tmp="${T}/libtool-elt.patch"
79 if [[ -n ${rem_int_dep} ]] ; then 104 sed "${sed_args[@]}" "${patch}" > "${tmp}" || die
80 # For replace @REM_INT_DEP@ with what was passed
81 # to --remove-internal-dep
82 local tmp="${T}/$$.rem_int_deps.patch"
83 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" "${patch}" > "${tmp}"
84 patch=${tmp}
85 fi
86
87 if ELT_try_and_apply_patch "${file}" "${patch}" ; then 105 if ELT_try_and_apply_patch "${file}" "${tmp}" "${patch}" ; then
88 # Break to unwind w/popd rather than return directly 106 # Break to unwind w/popd rather than return directly
89 ret=0 107 ret=0
90 break 108 break
91 fi 109 fi
92 done 110 done
111 local do_reversedeps="no" 129 local do_reversedeps="no"
112 local do_only_patches="no" 130 local do_only_patches="no"
113 local do_uclibc="yes" 131 local do_uclibc="yes"
114 local deptoremove= 132 local deptoremove=
115 local do_shallow="no" 133 local do_shallow="no"
134 local force="false"
116 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed" 135 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
117 136
118 for x in "$@" ; do 137 for x in "$@" ; do
119 case ${x} in 138 case ${x} in
120 --portage) 139 --portage)
145 do_shallow="yes" 164 do_shallow="yes"
146 ;; 165 ;;
147 --no-uclibc) 166 --no-uclibc)
148 do_uclibc="no" 167 do_uclibc="no"
149 ;; 168 ;;
169 --force)
170 force="true"
171 ;;
150 *) 172 *)
151 eerror "Invalid elibtoolize option: ${x}" 173 eerror "Invalid elibtoolize option: ${x}"
152 die "elibtoolize called with ${x} ??" 174 die "elibtoolize called with ${x} ??"
153 esac 175 esac
154 done 176 done
156 [[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf" 178 [[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf"
157 179
158 case ${CHOST} in 180 case ${CHOST} in
159 *-aix*) elt_patches+=" hardcode aixrtl aix-noundef" ;; #213277 181 *-aix*) elt_patches+=" hardcode aixrtl aix-noundef" ;; #213277
160 *-darwin*) elt_patches+=" darwin-ltconf darwin-ltmain darwin-conf" ;; 182 *-darwin*) elt_patches+=" darwin-ltconf darwin-ltmain darwin-conf" ;;
183 *-solaris*) elt_patches+=" sol2-conf sol2-ltmain" ;;
161 *-freebsd*) elt_patches+=" fbsd-conf fbsd-ltconf" ;; 184 *-freebsd*) elt_patches+=" fbsd-conf fbsd-ltconf" ;;
162 *-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" ;; 185 *-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" ;;
163 *-irix*) elt_patches+=" irix-ltmain" ;; 186 *-irix*) elt_patches+=" irix-ltmain" ;;
164 *-mint*) elt_patches+=" mint-conf" ;; 187 *-mint*) elt_patches+=" mint-conf" ;;
165 esac 188 esac
178 201
179 local d p 202 local d p
180 for d in "$@" ; do 203 for d in "$@" ; do
181 export ELT_APPLIED_PATCHES= 204 export ELT_APPLIED_PATCHES=
182 205
206 if [[ -f ${d}/.elibtoolized ]] ; then
207 ${force} || continue
208 fi
209
210 local outfunc="einfo"
183 [[ -f ${d}/.elibtoolized ]] && continue 211 [[ -f ${d}/.elibtoolized ]] && outfunc="ewarn"
184
185 einfo "Running elibtoolize in: ${d#${WORKDIR}/}/" 212 ${outfunc} "Running elibtoolize in: ${d#${WORKDIR}/}/"
213 if [[ ${outfunc} == "ewarn" ]] ; then
214 ewarn " We've already been run in this tree; you should"
215 ewarn " avoid this if possible (perhaps by filing a bug)"
216 fi
186 217
187 for p in ${elt_patches} ; do 218 for p in ${elt_patches} ; do
188 local ret=0 219 local ret=0
189 220
190 case ${p} in 221 case ${p} in
298 # have at least one patch succeeded. 329 # have at least one patch succeeded.
299 ret=0 330 ret=0
300 fi 331 fi
301 done 332 done
302 ;; 333 ;;
303 mint-conf|gold-conf) 334 mint-conf|gold-conf|sol2-conf)
304 ret=1 335 ret=1
305 local subret=1 336 local subret=1
306 if [[ -e ${d}/configure ]]; then 337 if [[ -e ${d}/configure ]]; then
307 ELT_walk_patches "${d}/configure" "${p}" 338 ELT_walk_patches "${d}/configure" "${p}"
308 subret=$? 339 subret=$?
468 fi 499 fi
469 500
470 echo 1 501 echo 1
471 return 1 502 return 1
472} 503}
504
505fi

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

  ViewVC Help
Powered by ViewVC 1.1.20