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

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

  ViewVC Help
Powered by ViewVC 1.1.20