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

Diff of /eclass/libtool.eclass

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

Revision 1.50 Revision 1.95
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.50 2005/07/11 15:08:06 swegener Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.95 2011/11/14 17:08:49 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=
25
26#
27# Returns all the directories containing ltmain.sh
28#
29ELT_find_ltmain_sh() {
30 local x=
31 local dirlist=
32
33 for x in $(find "${S}" -name 'ltmain.sh') ; do
34 dirlist="${dirlist} ${x%/*}"
35 done
36
37 echo "${dirlist}"
38}
39 22
40# 23#
41# 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
42# 25#
43ELT_try_and_apply_patch() { 26ELT_try_and_apply_patch() {
44 local ret=0 27 local ret=0
28 local file=$1
45 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}"
46 39
47 # 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?
48 if patch -p0 --dry-run $1 < ${patch} &> ${T}/elibtool.log ; then 41 if patch -p0 --dry-run "${file}" "${patch}" >> "${log}" 2>&1 ; then
49 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." 42 einfo " Applying ${disp} ..."
50 patch -p0 $1 < ${patch} &>${T}/elibtool.log 43 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" >> "${log}" 2>&1
51 ret=$? 44 ret=$?
52 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 45 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${src}"
53 else 46 else
54 ret=1 47 ret=1
55 fi 48 fi
56 49
57 return ${ret} 50 return "${ret}"
51}
52
53#
54# Get string version of ltmain.sh or ltconfig (passed as $1)
55#
56ELT_libtool_version() {
57 (
58 unset VERSION
59 eval $(grep -e '^[[:space:]]*VERSION=' "$1")
60 echo "${VERSION:-0}"
61 )
58} 62}
59 63
60# 64#
61# Run through the patches in $2 and see if any 65# Run through the patches in $2 and see if any
62# apply to $1 ... 66# apply to $1 ...
63# 67#
64ELT_walk_patches() { 68ELT_walk_patches() {
65 local x= 69 local patch tmp
66 local y=
67 local ret=1 70 local ret=1
71 local file=$1
68 local patch_dir= 72 local patch_set=$2
69 local version=$(eval $(grep -e '^[[:space:]]*VERSION=' $1); \
70 echo "${VERSION}")
71
72 if [[ -n $2 ]] ; then
73 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then
74 patch_dir="${ELT_PATCH_DIR}/$2" 73 local patch_dir="${ELT_PATCH_DIR}/${patch_set}"
75 else 74 local rem_int_dep=$3
76 return ${ret} 75
76 [[ -z ${patch_set} ]] && return 1
77 [[ ! -d ${patch_dir} ]] && return 1
78
79 # Allow patches to use @GENTOO_LIBDIR@ replacements
80 local sed_args=( -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" )
81 if [[ -n ${rem_int_dep} ]] ; then
82 # replace @REM_INT_DEP@ with what was passed
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
77 fi 97 fi
78
79 if [[ -z ${version} ]] ; then
80 eerror "Could not get VERSION for ${1##*/}!"
81 die "Could not get VERSION for ${1##*/}!"
82 fi
83
84 # Go through the patches in reverse order (large to small)
85 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | sort -r) ; do
86 if [[ -n ${x} && -f ${x} ]] ; then
87 local ltver=$(VER_to_int "${version}")
88 local ptver=$(VER_to_int "${x##*/}")
89
90 # If libtool version smaller than patch version, skip patch.
91 [[ ${ltver} -lt ${ptver} ]] && continue
92 # For --remove-internal-dep ...
93 if [[ -n $3 ]] ; then
94 # For replace @REM_INT_DEP@ with what was passed
95 # to --remove-internal-dep
96 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \
97 ${T}/$$.rem_int_deps.patch
98
99 x="${T}/$$.rem_int_deps.patch"
100 fi
101
102 if ELT_try_and_apply_patch "$1" "${x}" ; then
103 ret=0
104 break
105 fi
106 fi
107 done 98 done
108 fi
109 99
100 popd >/dev/null
110 return ${ret} 101 return ${ret}
111} 102}
112 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.
113elibtoolize() { 114elibtoolize() {
114 local x= 115 local x
115 local y=
116 local do_portage="no" 116 local do_portage="no"
117 local do_reversedeps="no" 117 local do_reversedeps="no"
118 local do_only_patches="no" 118 local do_only_patches="no"
119 local do_uclibc="yes"
119 local deptoremove= 120 local deptoremove=
120 local my_dirlist= 121 local do_shallow="no"
122 local force="false"
121 local elt_patches="portage relink max_cmd_len sed test tmp" 123 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
122 local start_dir="${PWD}"
123
124 my_dirlist="$(ELT_find_ltmain_sh)"
125 124
126 for x in "$@" ; do 125 for x in "$@" ; do
127 case "${x}" in 126 case ${x} in
128 "--portage") 127 --portage)
129 # Only apply portage patch, and don't 128 # Only apply portage patch, and don't
130 # 'libtoolize --copy --force' if all patches fail. 129 # 'libtoolize --copy --force' if all patches fail.
131 do_portage="yes" 130 do_portage="yes"
132 ;; 131 ;;
133 "--reverse-deps") 132 --reverse-deps)
134 # Apply the reverse-deps patch 133 # Apply the reverse-deps patch
135 # http://bugzilla.gnome.org/show_bug.cgi?id=75635 134 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
136 do_reversedeps="yes" 135 do_reversedeps="yes"
137 elt_patches="${elt_patches} fix-relink" 136 elt_patches+=" fix-relink"
138 ;; 137 ;;
139 "--patch-only") 138 --patch-only)
140 # Do not run libtoolize if none of the patches apply .. 139 # Do not run libtoolize if none of the patches apply ..
141 do_only_patches="yes" 140 do_only_patches="yes"
142 ;; 141 ;;
143 "^--remove-internal-dep="*) 142 --remove-internal-dep=*)
144 # We will replace @REM_INT_DEP@ with what is needed 143 # We will replace @REM_INT_DEP@ with what is needed
145 # in ELT_walk_patches() ... 144 # in ELT_walk_patches() ...
146 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" 145 deptoremove=${x#--remove-internal-dep=}
147 146
148 # Add the patch for this ... 147 # Add the patch for this ...
149 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" 148 [[ -n ${deptoremove} ]] && elt_patches+=" rem-int-dep"
150 ;; 149 ;;
151 "--shallow") 150 --shallow)
152 # Only patch the ltmain.sh in ${S} 151 # Only patch the ltmain.sh in ${S}
153 if [ -f "${S}/ltmain.sh" ] 152 do_shallow="yes"
154 then
155 my_dirlist="${S}"
156 else
157 my_dirlist=
158 fi
159 ;; 153 ;;
160 "--no-uclibc") 154 --no-uclibc)
161 NO_UCLIBCTOOLIZE=1 155 do_uclibc="no"
156 ;;
157 --force)
158 force="true"
162 ;; 159 ;;
163 *) 160 *)
164 eerror "Invalid elibtoolize option: $x" 161 eerror "Invalid elibtoolize option: ${x}"
165 die "elibtoolize called with $x ??" 162 die "elibtoolize called with ${x} ??"
166 esac 163 esac
167 done 164 done
168 165
169 if use ppc-macos ; then 166 [[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf"
170 glibtoolize --copy --force
171 darwintoolize
172 fi
173 167
174 for x in ${my_dirlist} ; do 168 case ${CHOST} in
175 local tmp=$(echo "${x}" | sed -e "s|${S}||") 169 *-aix*) elt_patches+=" hardcode aixrtl aix-noundef" ;; #213277
170 *-darwin*) elt_patches+=" darwin-ltconf darwin-ltmain darwin-conf" ;;
171 *-freebsd*) elt_patches+=" fbsd-conf fbsd-ltconf" ;;
172 *-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" ;;
173 *-irix*) elt_patches+=" irix-ltmain" ;;
174 *-mint*) elt_patches+=" mint-conf" ;;
175 esac
176
177 if $(tc-getLD) --version 2>&1 | grep -qs 'GNU gold'; then
178 elt_patches+=" gold-conf"
179 fi
180
181 # Reuse "$@" for dirs to patch
182 set --
183 if [[ ${do_shallow} == "yes" ]] ; then
184 [[ -f ${S}/ltmain.sh ]] && set -- "${S}"
185 else
186 set -- $(find "${S}" -name ltmain.sh -printf '%h ')
187 fi
188
189 local d p
190 for d in "$@" ; do
176 export ELT_APPLIED_PATCHES= 191 export ELT_APPLIED_PATCHES=
177 192
178 cd ${x} 193 if [[ -f ${d}/.elibtoolized ]] ; then
179 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g') ..." 194 ${force} || continue
195 fi
180 196
197 einfo "Running elibtoolize in: ${d#${WORKDIR}/}/"
198 if [[ -f ${d}/.elibtoolized ]] ; then
199 ewarn " We've already been run in this tree; you should"
200 ewarn " avoid this if possible (perhaps by filing a bug)"
201 fi
202
181 for y in ${elt_patches} ; do 203 for p in ${elt_patches} ; do
182 local ret=0 204 local ret=0
183 205
184 case "${y}" in 206 case ${p} in
207 portage)
208 # Stupid test to see if its already applied ...
209 if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
210 ELT_walk_patches "${d}/ltmain.sh" "${p}"
211 ret=$?
212 fi
213 ;;
185 "rem-int-dep") 214 rem-int-dep)
186 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 215 ELT_walk_patches "${d}/ltmain.sh" "${p}" "${deptoremove}"
187 ret=$? 216 ret=$?
188 ;; 217 ;;
189 "fix-relink") 218 fix-relink)
190 # Do not apply if we do not have the relink patch applied ... 219 # Do not apply if we do not have the relink patch applied ...
191 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 220 if grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" ; then
192 ELT_walk_patches "${x}/ltmain.sh" "${y}" 221 ELT_walk_patches "${d}/ltmain.sh" "${p}"
193 ret=$? 222 ret=$?
194 fi 223 fi
195 ;; 224 ;;
196 "max_cmd_len") 225 max_cmd_len)
197 # Do not apply if $max_cmd_len is not used ... 226 # Do not apply if $max_cmd_len is not used ...
198 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 227 if grep -qs 'max_cmd_len' "${d}/ltmain.sh" ; then
199 ELT_walk_patches "${x}/ltmain.sh" "${y}" 228 ELT_walk_patches "${d}/ltmain.sh" "${p}"
229 ret=$?
230 fi
231 ;;
232 as-needed)
233 ELT_walk_patches "${d}/ltmain.sh" "${p}"
234 ret=$?
235 ;;
236 uclibc-conf)
237 if grep -qs 'Transform linux' "${d}/configure" ; then
238 ELT_walk_patches "${d}/configure" "${p}"
239 ret=$?
240 # ltmain.sh and co might be in a subdirectory ...
241 elif [[ ! -e ${d}/configure ]] && \
242 grep -qs 'Transform linux' "${d}/../configure" ; then
243 ELT_walk_patches "${d}/../configure" "${p}"
244 ret=$?
245 fi
246 ;;
247 uclibc-ltconf)
248 # Newer libtoolize clears ltconfig, as not used anymore
249 if [[ -s ${d}/ltconfig ]] ; then
250 ELT_walk_patches "${d}/ltconfig" "${p}"
251 ret=$?
252 fi
253 ;;
254 fbsd-conf)
255 if grep -qs 'version_type=freebsd-' "${d}/configure" ; then
256 ELT_walk_patches "${d}/configure" "${p}"
257 ret=$?
258 # ltmain.sh and co might be in a subdirectory ...
259 elif [[ ! -e ${d}/configure ]] && \
260 grep -qs 'version_type=freebsd-' "${d}/../configure" ; then
261 ELT_walk_patches "${d}/../configure" "${p}"
262 ret=$?
263 fi
264 ;;
265 fbsd-ltconf)
266 if [[ -s ${d}/ltconfig ]] ; then
267 ELT_walk_patches "${d}/ltconfig" "${p}"
268 ret=$?
269 fi
270 ;;
271 darwin-conf)
272 if grep -qs '&& echo \.so ||' "${d}/configure" ; then
273 ELT_walk_patches "${d}/configure" "${p}"
274 ret=$?
275 # ltmain.sh and co might be in a subdirectory ...
276 elif [[ ! -e ${d}/configure ]] && \
277 grep -qs '&& echo \.so ||' "${d}/../configure" ; then
278 ELT_walk_patches "${d}/../configure" "${p}"
279 ret=$?
280 fi
281 ;;
282 darwin-ltconf)
283 # Newer libtoolize clears ltconfig, as not used anymore
284 if [[ -s ${d}/ltconfig ]] ; then
285 ELT_walk_patches "${d}/ltconfig" "${p}"
286 ret=$?
287 fi
288 ;;
289 darwin-ltmain)
290 # special case to avoid false positives (failing to apply
291 # ltmain.sh path message), newer libtools have this patch
292 # built in, so not much to patch around then
293 if [[ -e ${d}/ltmain.sh ]] && \
294 ! grep -qs 'verstring="-compatibility_version' "${d}/ltmain.sh" ; then
295 ELT_walk_patches "${d}/ltmain.sh" "${p}"
296 ret=$?
297 fi
298 ;;
299 aixrtl|hpux-conf)
300 ret=1
301 local subret=0
302 # apply multiple patches as often as they match
303 while [[ $subret -eq 0 ]]; do
304 subret=1
305 if [[ -e ${d}/configure ]]; then
306 ELT_walk_patches "${d}/configure" "${p}"
307 subret=$?
308 # ltmain.sh and co might be in a subdirectory ...
309 elif [[ ! -e ${d}/configure && -e ${d}/../configure ]] ; then
310 ELT_walk_patches "${d}/../configure" "${p}"
311 subret=$?
312 fi
313 if [[ $subret -eq 0 ]]; then
314 # have at least one patch succeeded.
315 ret=0
316 fi
317 done
318 ;;
319 mint-conf|gold-conf)
320 ret=1
321 local subret=1
322 if [[ -e ${d}/configure ]]; then
323 ELT_walk_patches "${d}/configure" "${p}"
324 subret=$?
325 # ltmain.sh and co might be in a subdirectory ...
326 elif [[ -e ${d}/../configure ]] ; then
327 ELT_walk_patches "${d}/../configure" "${p}"
328 subret=$?
329 elif [[ -e ${d}/../../configure ]] ; then
330 ELT_walk_patches "${d}/../../configure" "${p}"
331 subret=$?
332 fi
333 if [[ $subret -eq 0 ]]; then
334 # have at least one patch succeeded.
335 ret=0
336 fi
337 ;;
338 install-sh)
339 ELT_walk_patches "${d}/install-sh" "${p}"
340 ret=$?
341 ;;
342 cross)
343 if tc-is-cross-compiler ; then
344 ELT_walk_patches "${d}/ltmain.sh" "${p}"
200 ret=$? 345 ret=$?
201 fi 346 fi
202 ;; 347 ;;
203 *) 348 *)
204 ELT_walk_patches "${x}/ltmain.sh" "${y}" 349 ELT_walk_patches "${d}/ltmain.sh" "${p}"
205 ret=$? 350 ret=$?
206 ;; 351 ;;
207 esac 352 esac
208 353
209 if [[ ${ret} -ne 0 ]] ; then 354 if [[ ${ret} -ne 0 ]] ; then
210 case ${y} in 355 case ${p} in
211 "relink") 356 relink)
357 local version=$(ELT_libtool_version "${d}/ltmain.sh")
212 # Critical patch, but could be applied ... 358 # Critical patch, but could be applied ...
213 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 359 # FIXME: Still need a patch for ltmain.sh > 1.4.0
360 if ! grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" && \
361 [[ $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
214 ewarn " Could not apply relink.patch!" 362 ewarn " Could not apply relink.patch!"
215 fi 363 fi
216 ;; 364 ;;
217 "portage") 365 portage)
218 # Critical patch - for this one we abort, as it can really 366 # Critical patch - for this one we abort, as it can really
219 # cause breakage without it applied! 367 # cause breakage without it applied!
220 if [[ ${do_portage} == "yes" ]] ; then 368 if [[ ${do_portage} == "yes" ]] ; then
221 # Stupid test to see if its already applied ... 369 # Stupid test to see if its already applied ...
222 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 370 if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
223 echo 371 echo
224 eerror "Portage patch requested, but failed to apply!" 372 eerror "Portage patch requested, but failed to apply!"
373 eerror "Please file a bug report to add a proper patch."
225 die "Portage patch requested, but failed to apply!" 374 die "Portage patch requested, but failed to apply!"
226 fi 375 fi
227 else 376 else
228 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 377 if grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
229 ewarn " Portage patch seems to be already applied." 378 # ewarn " Portage patch seems to be already applied."
230 ewarn " Please verify that it is not needed." 379 # ewarn " Please verify that it is not needed."
380 :
231 else 381 else
232 local version=$( \ 382 local version=$(ELT_libtool_version "${d}"/ltmain.sh)
233 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
234 echo "${VERSION}")
235
236 echo 383 echo
237 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 384 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
385 eerror "Please file a bug report to add a proper patch."
238 die "Portage patch failed to apply!" 386 die "Portage patch failed to apply!"
239 fi 387 fi
240 # We do not want to run libtoolize ... 388 # We do not want to run libtoolize ...
241 ELT_APPLIED_PATCHES="portage" 389 ELT_APPLIED_PATCHES="portage"
242 fi 390 fi
243 ;; 391 ;;
392 uclibc-*)
393 [[ ${CHOST} == *-uclibc ]] && ewarn " uClibc patch set '${p}' failed to apply!"
394 ;;
395 fbsd-*)
396 if [[ ${CHOST} == *-freebsd* ]] ; then
397 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
398 "${d}/configure" "${d}/../configure" 2>/dev/null) ]]; then
399 eerror " FreeBSD patch set '${p}' failed to apply!"
400 die "FreeBSD patch set '${p}' failed to apply!"
401 fi
402 fi
403 ;;
404 darwin-*)
405 [[ ${CHOST} == *"-darwin"* ]] && ewarn " Darwin patch set '${p}' failed to apply!"
406 ;;
244 esac 407 esac
245 fi 408 fi
409 done
246 410
247 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then 411 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
248 if [[ ${do_portage} == "no" && \ 412 if [[ ${do_portage} == "no" && \
249 ${do_reversedeps} == "no" && \ 413 ${do_reversedeps} == "no" && \
250 ${do_only_patches} == "no" && \ 414 ${do_only_patches} == "no" && \
251 ${deptoremove} == "" ]] 415 ${deptoremove} == "" ]]
252 then 416 then
253 ewarn "Cannot apply any patches, please file a bug about this" 417 ewarn "Cannot apply any patches, please file a bug about this"
254 break
255
256 # Sometimes ltmain.sh is in a subdirectory ...
257 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
258 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
259 cd "${x}"/../
260 fi
261 fi
262
263 if type -p libtoolize &> /dev/null ; then
264 ewarn "Cannot apply any patches, running libtoolize..."
265 libtoolize --copy --force
266 fi
267 cd "${x}"
268 break
269 fi 418 die
270 fi 419 fi
271 done 420 fi
421
422 rm -f "${d}/libtool"
423
424 > "${d}/.elibtoolized"
272 done 425 done
273
274 if [[ -f libtool ]] ; then
275 rm -f libtool
276 fi
277
278 cd "${start_dir}"
279
280 uclibctoolize
281} 426}
282 427
283uclibctoolize() { 428uclibctoolize() { die "Use elibtoolize"; }
284 [[ -n ${NO_UCLIBCTOOLIZE} ]] && return 0 429darwintoolize() { die "Use elibtoolize"; }
285
286 local errmsg=""
287 [[ ${CTARGET:-${CHOST}} == *-uclibc ]] \
288 && errmsg="PLEASE CHECK" \
289 || errmsg="Already patched"
290 local targets=""
291 local x
292
293 if [[ -z $* ]] ; then
294 targets=$(find ${S} -name configure -o -name ltconfig)
295 fi
296
297 einfo "Applying uClibc/libtool patches ..."
298 for x in ${targets} ; do
299 [[ ! -s ${x} ]] && continue
300 case ${x##*/} in
301 configure)
302 if grep 'Transform linux' "${x}" > /dev/null ; then
303 ebegin " Fixing \${S}${x/${S}}"
304 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null
305 eend $? "${errmsg} ${x}"
306 fi
307 ;;
308
309 ltconfig)
310 local ver=$(grep '^VERSION=' ${x})
311 ver=${ver/VERSION=}
312 [[ ${ver:0:3} == "1.4" ]] && ver="1.3" # 1.4 and 1.3 are compat
313 ebegin " Fixing \${S}${x/${S}}"
314 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null
315 eend $? "${errmsg} ${x}"
316 ;;
317 esac
318 done
319}
320
321darwintoolize() {
322 local targets=""
323 local x
324
325 if [[ -z $* ]] ; then
326 targets=$(find ${S} -name ltmain.sh -o -name ltconfig)
327 fi
328
329 einfo "Applying Darwin/libtool patches ..."
330 for x in ${targets} ; do
331 [[ ! -s ${x} ]] && continue
332 case ${x##*/} in
333 ltmain.sh|ltconfig)
334 local ver=$(grep '^VERSION=' ${x})
335 ver=${ver/VERSION=}
336 if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then
337 ver="1.3" # 1.4, 1.5 and 1.3 are compat
338 fi
339
340 ebegin " Fixing \${S}${x/${S}}"
341 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null
342 eend $? "PLEASE CHECK ${x}"
343 ;;
344 esac
345 done
346}
347 430
348# char *VER_major(string) 431# char *VER_major(string)
349# 432#
350# Return the Major (X of X.Y.Z) version 433# Return the Major (X of X.Y.Z) version
351# 434#
352VER_major() { 435VER_major() {
353 [[ -z $1 ]] && return 1 436 [[ -z $1 ]] && return 1
354 437
355 local VER=$@ 438 local VER=$@
356 echo ${VER%%[^[:digit:]]*} 439 echo "${VER%%[^[:digit:]]*}"
357} 440}
358 441
359# char *VER_minor(string) 442# char *VER_minor(string)
360# 443#
361# Return the Minor (Y of X.Y.Z) version 444# Return the Minor (Y of X.Y.Z) version
363VER_minor() { 446VER_minor() {
364 [[ -z $1 ]] && return 1 447 [[ -z $1 ]] && return 1
365 448
366 local VER=$@ 449 local VER=$@
367 VER=${VER#*.} 450 VER=${VER#*.}
368 echo ${VER%%[^[:digit:]]*} 451 echo "${VER%%[^[:digit:]]*}"
369} 452}
370 453
371# char *VER_micro(string) 454# char *VER_micro(string)
372# 455#
373# Return the Micro (Z of X.Y.Z) version. 456# Return the Micro (Z of X.Y.Z) version.
375VER_micro() { 458VER_micro() {
376 [[ -z $1 ]] && return 1 459 [[ -z $1 ]] && return 1
377 460
378 local VER=$@ 461 local VER=$@
379 VER=${VER#*.*.} 462 VER=${VER#*.*.}
380 echo ${VER%%[^[:digit:]]*} 463 echo "${VER%%[^[:digit:]]*}"
381} 464}
382 465
383# int VER_to_int(string) 466# int VER_to_int(string)
384# 467#
385# Convert a string type version (2.4.0) to an int (132096) 468# Convert a string type version (2.4.0) to an int (132096)

Legend:
Removed from v.1.50  
changed lines
  Added in v.1.95

  ViewVC Help
Powered by ViewVC 1.1.20