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

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

  ViewVC Help
Powered by ViewVC 1.1.20