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

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

  ViewVC Help
Powered by ViewVC 1.1.20