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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.49  
changed lines
  Added in v.1.103

  ViewVC Help
Powered by ViewVC 1.1.20