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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.54  
changed lines
  Added in v.1.100

  ViewVC Help
Powered by ViewVC 1.1.20