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

Diff of /eclass/libtool.eclass

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

Revision 1.47 Revision 1.83
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2007 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.47 2005/05/27 23:46:13 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.83 2009/05/03 20:03:10 loki_val Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Maintainer: base-system@gentoo.org
6# 6#
7# This eclass patches ltmain.sh distributed with libtoolized packages with the 7# This eclass patches ltmain.sh distributed with libtoolized packages with the
8# relink and portage patch among others 8# relink and portage patch among others
9 9#
10ECLASS="libtool" 10# Note, this eclass does not require libtool as it only applies patches to
11INHERITED="${INHERITED} ${ECLASS}" 11# generated libtool files. We do not run the libtoolize program because that
12 12# requires a regeneration of the main autotool files in order to work properly.
13# 2004.09.25 rac
14# i have verified that at least one package can use this eclass and
15# build properly even without libtool installed yet, probably using
16# the files in the distribution. eliminating this dependency fixes
17# bug 65209, which is a showstopper for people doing installs using
18# stageballs <3. if anybody decides to revert this, please attempt
19# to find an alternate way of resolving that bug at the same time.
20 13
21DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
22 15
23ELIBTOOL_VERSION="2.0.2" 16ELIBTOOL_VERSION="2.0.2"
24 17
18inherit toolchain-funcs
19
25ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" 20ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
26ELT_APPLIED_PATCHES= 21ELT_APPLIED_PATCHES=
22ELT_LTMAIN_SH=
27 23
28# 24#
29# Returns all the directories containing ltmain.sh 25# Returns all the directories containing ltmain.sh
30# 26#
31ELT_find_ltmain_sh() { 27ELT_find_ltmain_sh() {
… …
42# 38#
43# See if we can apply $2 on $1, and if so, do it 39# See if we can apply $2 on $1, and if so, do it
44# 40#
45ELT_try_and_apply_patch() { 41ELT_try_and_apply_patch() {
46 local ret=0 42 local ret=0
43 local file=$1
47 local patch="$2" 44 local patch=$2
48 45
49 # We only support patchlevel of 0 - why worry if its static patches? 46 # We only support patchlevel of 0 - why worry if its static patches?
50 if patch -p0 --dry-run $1 < ${patch} &> ${T}/elibtool.log ; then 47 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." 48 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
52 patch -p0 $1 < ${patch} &>${T}/elibtool.log 49 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
50 &> "${T}/elibtool.log"
53 ret=$? 51 ret=$?
54 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 52 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
55 else 53 else
56 ret=1 54 ret=1
57 fi 55 fi
58 56
59 return ${ret} 57 return "${ret}"
58}
59
60#
61# Get string version of ltmain.sh or ltconfig (passed as $1)
62#
63ELT_libtool_version() {
64 local ltmain_sh=$1
65 local version=
66
67 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
68 echo "${VERSION}")
69 [[ -z ${version} ]] && version="0"
70
71 echo "${version}"
60} 72}
61 73
62# 74#
63# Run through the patches in $2 and see if any 75# Run through the patches in $2 and see if any
64# apply to $1 ... 76# apply to $1 ...
65# 77#
66ELT_walk_patches() { 78ELT_walk_patches() {
67 local x= 79 local x=
68 local y= 80 local y=
69 local ret=1 81 local ret=1
82 local file=$1
83 local patch_set=$2
70 local patch_dir= 84 local patch_dir=
71 local version=$(eval $(grep -e '^[[:space:]]*VERSION=' $1); \ 85 local rem_int_dep=$3
72 echo "${VERSION}")
73 86
74 if [[ -n $2 ]] ; then 87 if [[ -n ${patch_set} ]] ; then
75 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then 88 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
76 patch_dir="${ELT_PATCH_DIR}/$2" 89 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
77 else 90 else
78 return ${ret} 91 return "${ret}"
79 fi 92 fi
80 93
81 if [[ -z ${version} ]] ; then
82 eerror "Could not get VERSION for ${1##*/}!"
83 die "Could not get VERSION for ${1##*/}!"
84 fi
85
86 # Go through the patches in reverse order (large to small) 94 # Go through the patches in reverse order (large to small)
87 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | sort -r) ; do 95 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
88 if [[ -n ${x} && -f ${x} ]] ; then 96 if [[ -n ${x} && -f ${x} ]] ; then
89 local ltver=$(VER_to_int "${version}")
90 local ptver=$(VER_to_int "${x##*/}")
91
92 # If libtool version smaller than patch version, skip patch.
93 [[ ${ltver} -lt ${ptver} ]] && continue
94 # For --remove-internal-dep ... 97 # For --remove-internal-dep ...
95 if [[ -n $3 ]] ; then 98 if [[ -n ${rem_int_dep} ]] ; then
96 # For replace @REM_INT_DEP@ with what was passed 99 # For replace @REM_INT_DEP@ with what was passed
97 # to --remove-internal-dep 100 # to --remove-internal-dep
98 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ 101 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
99 ${T}/$$.rem_int_deps.patch 102 "${T}/$$.rem_int_deps.patch"
100 103
101 x="${T}/$$.rem_int_deps.patch" 104 x="${T}/$$.rem_int_deps.patch"
102 fi 105 fi
103 106
104 if ELT_try_and_apply_patch "$1" "${x}" ; then 107 if ELT_try_and_apply_patch "${file}" "${x}" ; then
105 ret=0 108 ret=0
106 break 109 break
107 fi 110 fi
108 fi 111 fi
109 done 112 done
110 fi 113 fi
111 114
112 return ${ret} 115 return "${ret}"
113} 116}
114 117
115elibtoolize() { 118elibtoolize() {
116 local x= 119 local x=
117 local y= 120 local y=
118 local do_portage="no" 121 local do_portage="no"
119 local do_reversedeps="no" 122 local do_reversedeps="no"
120 local do_only_patches="no" 123 local do_only_patches="no"
124 local do_uclibc="yes"
121 local deptoremove= 125 local deptoremove=
122 local my_dirlist= 126 local my_dirlist=
123 local elt_patches="portage relink max_cmd_len sed test tmp" 127 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
124 local start_dir="${PWD}" 128 local start_dir=${PWD}
125 129
126 my_dirlist="$(ELT_find_ltmain_sh)" 130 my_dirlist=$(ELT_find_ltmain_sh)
127 131
128 for x in "$@" ; do 132 for x in "$@" ; do
129 case "${x}" in 133 case "${x}" in
130 "--portage") 134 "--portage")
131 # Only apply portage patch, and don't 135 # Only apply portage patch, and don't
… …
143 do_only_patches="yes" 147 do_only_patches="yes"
144 ;; 148 ;;
145 "^--remove-internal-dep="*) 149 "^--remove-internal-dep="*)
146 # We will replace @REM_INT_DEP@ with what is needed 150 # We will replace @REM_INT_DEP@ with what is needed
147 # in ELT_walk_patches() ... 151 # in ELT_walk_patches() ...
148 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" 152 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
149 153
150 # Add the patch for this ... 154 # Add the patch for this ...
151 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" 155 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
152 ;; 156 ;;
153 "--shallow") 157 "--shallow")
154 # Only patch the ltmain.sh in ${S} 158 # Only patch the ltmain.sh in ${S}
155 if [ -f "${S}/ltmain.sh" ] 159 if [[ -f ${S}/ltmain.sh ]] ; then
156 then
157 my_dirlist="${S}" 160 my_dirlist=${S}
158 else 161 else
159 my_dirlist= 162 my_dirlist=
160 fi 163 fi
161 ;; 164 ;;
162 "--no-uclibc") 165 "--no-uclibc")
163 NO_UCLIBCTOOLIZE=1 166 do_uclibc="no"
164 ;; 167 ;;
165 *) 168 *)
166 eerror "Invalid elibtoolize option: $x" 169 eerror "Invalid elibtoolize option: ${x}"
167 die "elibtoolize called with $x ??" 170 die "elibtoolize called with ${x} ??"
168 esac 171 esac
169 done 172 done
170 173
171 if use ppc-macos ; then 174 [[ ${do_uclibc} == "yes" ]] && \
172 glibtoolize --copy --force 175 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
173 darwintoolize 176
174 fi 177 [[ ${CHOST} == *"-freebsd"* ]] && \
178 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
179
180 [[ ${CHOST} == *"-darwin"* ]] && \
181 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
175 182
176 for x in ${my_dirlist} ; do 183 for x in ${my_dirlist} ; do
177 local tmp=$(echo "${x}" | sed -e "s|${S}||") 184 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
178 export ELT_APPLIED_PATCHES= 185 export ELT_APPLIED_PATCHES=
186 export ELT_LTMAIN_SH="${x}/ltmain.sh"
187
188 [[ -f ${x}/.elibtoolized ]] && continue
179 189
180 cd ${x} 190 cd ${x}
181 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g') ..." 191 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
182 192
183 for y in ${elt_patches} ; do 193 for y in ${elt_patches} ; do
184 local ret=0 194 local ret=0
185 195
186 case "${y}" in 196 case "${y}" in
197 "portage")
198 # Stupid test to see if its already applied ...
199 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
200 ELT_walk_patches "${x}/ltmain.sh" "${y}"
201 ret=$?
202 fi
203 ;;
187 "rem-int-dep") 204 "rem-int-dep")
188 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 205 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
189 ret=$? 206 ret=$?
190 ;; 207 ;;
191 "fix-relink") 208 "fix-relink")
… …
200 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 217 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
201 ELT_walk_patches "${x}/ltmain.sh" "${y}" 218 ELT_walk_patches "${x}/ltmain.sh" "${y}"
202 ret=$? 219 ret=$?
203 fi 220 fi
204 ;; 221 ;;
222 "as-needed")
223 ELT_walk_patches "${x}/ltmain.sh" "${y}"
224 ret=$?
225 ;;
226 "uclibc-conf")
227 if [[ -e ${x}/configure && \
228 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
229 ELT_walk_patches "${x}/configure" "${y}"
230 ret=$?
231 # ltmain.sh and co might be in a subdirectory ...
232 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
233 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
234 ELT_walk_patches "${x}/../configure" "${y}"
235 ret=$?
236 fi
237 ;;
238 "uclibc-ltconf")
239 # Newer libtoolize clears ltconfig, as not used anymore
240 if [[ -s ${x}/ltconfig ]] ; then
241 ELT_walk_patches "${x}/ltconfig" "${y}"
242 ret=$?
243 fi
244 ;;
245 "fbsd-conf")
246 if [[ -e ${x}/configure && \
247 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
248 ELT_walk_patches "${x}/configure" "${y}"
249 ret=$?
250 # ltmain.sh and co might be in a subdirectory ...
251 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
252 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
253 ELT_walk_patches "${x}/../configure" "${y}"
254 ret=$?
255 fi
256 ;;
257 "fbsd-ltconf")
258 if [[ -s ${x}/ltconfig ]] ; then
259 ELT_walk_patches "${x}/ltconfig" "${y}"
260 ret=$?
261 fi
262 ;;
263 "darwin-ltconf")
264 # Newer libtoolize clears ltconfig, as not used anymore
265 if [[ -s ${x}/ltconfig ]] ; then
266 ELT_walk_patches "${x}/ltconfig" "${y}"
267 ret=$?
268 fi
269 ;;
270 "install-sh")
271 ELT_walk_patches "${x}/install-sh" "${y}"
272 ret=$?
273 ;;
274 "cross")
275 if tc-is-cross-compiler ; then
276 ELT_walk_patches "${x}/ltmain.sh" "${y}"
277 ret=$?
278 fi
279 ;;
205 *) 280 *)
206 ELT_walk_patches "${x}/ltmain.sh" "${y}" 281 ELT_walk_patches "${x}/ltmain.sh" "${y}"
207 ret=$? 282 ret=$?
208 ;; 283 ;;
209 esac 284 esac
210 285
211 if [[ ${ret} -ne 0 ]] ; then 286 if [[ ${ret} -ne 0 ]] ; then
212 case ${y} in 287 case ${y} in
213 "relink") 288 "relink")
289 local version=$(ELT_libtool_version "${x}/ltmain.sh")
214 # Critical patch, but could be applied ... 290 # Critical patch, but could be applied ...
291 # FIXME: Still need a patch for ltmain.sh > 1.4.0
215 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 292 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
293 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
216 ewarn " Could not apply relink.patch!" 294 ewarn " Could not apply relink.patch!"
217 fi 295 fi
218 ;; 296 ;;
219 "portage") 297 "portage")
220 # Critical patch - for this one we abort, as it can really 298 # Critical patch - for this one we abort, as it can really
… …
222 if [[ ${do_portage} == "yes" ]] ; then 300 if [[ ${do_portage} == "yes" ]] ; then
223 # Stupid test to see if its already applied ... 301 # Stupid test to see if its already applied ...
224 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 302 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
225 echo 303 echo
226 eerror "Portage patch requested, but failed to apply!" 304 eerror "Portage patch requested, but failed to apply!"
305 eerror "Please bug azarah or vapier to add proper patch."
227 die "Portage patch requested, but failed to apply!" 306 die "Portage patch requested, but failed to apply!"
228 fi 307 fi
229 else 308 else
230 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 309 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
231 ewarn " Portage patch seems to be already applied." 310 # ewarn " Portage patch seems to be already applied."
232 ewarn " Please verify that it is not needed." 311 # ewarn " Please verify that it is not needed."
312 :
233 else 313 else
234 local version=$( \ 314 local version=$( \
235 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \ 315 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
236 echo "${VERSION}") 316 echo "${VERSION}")
237 317
238 echo 318 echo
239 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 319 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
320 eerror "Please bug azarah or vapier to add proper patch."
240 die "Portage patch failed to apply!" 321 die "Portage patch failed to apply!"
241 fi 322 fi
242 # We do not want to run libtoolize ... 323 # We do not want to run libtoolize ...
243 ELT_APPLIED_PATCHES="portage" 324 ELT_APPLIED_PATCHES="portage"
244 fi 325 fi
245 ;; 326 ;;
327 "uclibc-"*)
328 [[ ${CHOST} == *"-uclibc" ]] && \
329 ewarn " uClibc patch set '${y}' failed to apply!"
330 ;;
331 "fbsd-"*)
332 if [[ ${CHOST} == *"-freebsd"* ]] ; then
333 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
334 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
335 eerror " FreeBSD patch set '${y}' failed to apply!"
336 die "FreeBSD patch set '${y}' failed to apply!"
337 fi
338 fi
339 ;;
340 "darwin-"*)
341 [[ ${CHOST} == *"-darwin"* ]] && \
342 ewarn " Darwin patch set '${y}' failed to apply!"
343 ;;
246 esac 344 esac
247 fi 345 fi
346 done
248 347
249 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then 348 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
250 if [[ ${do_portage} == "no" && \ 349 if [[ ${do_portage} == "no" && \
251 ${do_reversedeps} == "no" && \ 350 ${do_reversedeps} == "no" && \
252 ${do_only_patches} == "no" && \ 351 ${do_only_patches} == "no" && \
253 ${deptoremove} == "" ]] 352 ${deptoremove} == "" ]]
254 then 353 then
255 ewarn "Cannot apply any patches, please file a bug about this" 354 ewarn "Cannot apply any patches, please file a bug about this"
256 break
257
258 # Sometimes ltmain.sh is in a subdirectory ...
259 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
260 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
261 cd "${x}"/../
262 fi
263 fi
264
265 if type -p libtoolize &> /dev/null ; then
266 ewarn "Cannot apply any patches, running libtoolize..."
267 libtoolize --copy --force
268 fi
269 cd "${x}"
270 break
271 fi 355 die
272 fi 356 fi
273 done 357 fi
358
359 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
360
361 >> "${x}/.elibtoolized"
274 done 362 done
275 363
276 if [[ -f libtool ]] ; then
277 rm -f libtool
278 fi
279
280 cd "${start_dir}" 364 cd "${start_dir}"
281
282 uclibctoolize
283} 365}
284 366
285uclibctoolize() { 367uclibctoolize() {
286 [[ -n ${NO_UCLIBCTOOLIZE} ]] && return 0 368 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
287 369 elibtoolize
288 local errmsg=""
289 [[ ${CTARGET:-${CHOST}} == *-uclibc ]] \
290 && errmsg="PLEASE CHECK" \
291 || errmsg="Already patched"
292 local targets=""
293 local x
294
295 if [[ -z $* ]] ; then
296 targets=$(find ${S} -name configure -o -name ltconfig)
297 fi
298
299 einfo "Applying uClibc/libtool patches ..."
300 for x in ${targets} ; do
301 [[ ! -s ${x} ]] && continue
302 case ${x##*/} in
303 configure)
304 if grep 'Transform linux' "${x}" > /dev/null ; then
305 ebegin " Fixing \${S}${x/${S}}"
306 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null
307 eend $? "${errmsg} ${x}"
308 fi
309 ;;
310
311 ltconfig)
312 local ver=$(grep '^VERSION=' ${x})
313 ver=${ver/VERSION=}
314 [[ ${ver:0:3} == "1.4" ]] && ver="1.3" # 1.4 and 1.3 are compat
315 ebegin " Fixing \${S}${x/${S}}"
316 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null
317 eend $? "${errmsg} ${x}"
318 ;;
319 esac
320 done
321} 370}
322 371
323darwintoolize() { 372darwintoolize() {
324 local targets="" 373 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
325 local x 374 elibtoolize
326
327 if [[ -z $* ]] ; then
328 targets=$(find ${S} -name ltmain.sh -o -name ltconfig)
329 fi
330
331 einfo "Applying Darwin/libtool patches ..."
332 for x in ${targets} ; do
333 [[ ! -s ${x} ]] && continue
334 case ${x##*/} in
335 ltmain.sh|ltconfig)
336 local ver=$(grep '^VERSION=' ${x})
337 ver=${ver/VERSION=}
338 if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then
339 ver="1.3" # 1.4, 1.5 and 1.3 are compat
340 fi
341
342 ebegin " Fixing \${S}${x/${S}}"
343 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null
344 eend $? "PLEASE CHECK ${x}"
345 ;;
346 esac
347 done
348} 375}
349 376
350# char *VER_major(string) 377# char *VER_major(string)
351# 378#
352# Return the Major (X of X.Y.Z) version 379# Return the Major (X of X.Y.Z) version
353# 380#
354VER_major() { 381VER_major() {
355 [[ -z $1 ]] && return 1 382 [[ -z $1 ]] && return 1
356 383
357 local VER=$@ 384 local VER=$@
358 echo ${VER%%[^[:digit:]]*} 385 echo "${VER%%[^[:digit:]]*}"
359} 386}
360 387
361# char *VER_minor(string) 388# char *VER_minor(string)
362# 389#
363# Return the Minor (Y of X.Y.Z) version 390# Return the Minor (Y of X.Y.Z) version
… …
365VER_minor() { 392VER_minor() {
366 [[ -z $1 ]] && return 1 393 [[ -z $1 ]] && return 1
367 394
368 local VER=$@ 395 local VER=$@
369 VER=${VER#*.} 396 VER=${VER#*.}
370 echo ${VER%%[^[:digit:]]*} 397 echo "${VER%%[^[:digit:]]*}"
371} 398}
372 399
373# char *VER_micro(string) 400# char *VER_micro(string)
374# 401#
375# Return the Micro (Z of X.Y.Z) version. 402# Return the Micro (Z of X.Y.Z) version.
… …
377VER_micro() { 404VER_micro() {
378 [[ -z $1 ]] && return 1 405 [[ -z $1 ]] && return 1
379 406
380 local VER=$@ 407 local VER=$@
381 VER=${VER#*.*.} 408 VER=${VER#*.*.}
382 echo ${VER%%[^[:digit:]]*} 409 echo "${VER%%[^[:digit:]]*}"
383} 410}
384 411
385# int VER_to_int(string) 412# int VER_to_int(string)
386# 413#
387# Convert a string type version (2.4.0) to an int (132096) 414# Convert a string type version (2.4.0) to an int (132096)
Legend:
Removed from v.1.47  
changed lines
  Added in v.1.83
  ViewVC Help
Powered by ViewVC 1.1.13