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

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

  ViewVC Help
Powered by ViewVC 1.1.20