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

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

  ViewVC Help
Powered by ViewVC 1.1.20