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