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

Diff of /eclass/libtool.eclass

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

Revision 1.56 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.56 2005/09/04 20:23:42 azarah 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#
10 10# Note, this eclass does not require libtool as it only applies patches to
11# 2004.09.25 rac 11# 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 12# 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 13
19DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
20 15
21ELIBTOOL_VERSION="2.0.2" 16ELIBTOOL_VERSION="2.0.2"
22 17
18inherit toolchain-funcs
19
23ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" 20ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
24ELT_APPLIED_PATCHES= 21ELT_APPLIED_PATCHES=
25ELT_LTMAIN_SH= 22ELT_LTMAIN_SH=
26 23
27# 24#
28# Returns all the directories containing ltmain.sh 25# Returns all the directories containing ltmain.sh
41# 38#
42# 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
43# 40#
44ELT_try_and_apply_patch() { 41ELT_try_and_apply_patch() {
45 local ret=0 42 local ret=0
43 local file=$1
46 local patch="$2" 44 local patch=$2
47 45
48 # 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?
49 if patch -p0 --dry-run $1 < ${patch} &> ${T}/elibtool.log ; then 47 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
50 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." 48 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
51 patch -p0 $1 < ${patch} &>${T}/elibtool.log 49 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
50 &> "${T}/elibtool.log"
52 ret=$? 51 ret=$?
53 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 52 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
54 else 53 else
55 ret=1 54 ret=1
56 fi 55 fi
57 56
58 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}"
59} 72}
60 73
61# 74#
62# Run through the patches in $2 and see if any 75# Run through the patches in $2 and see if any
63# apply to $1 ... 76# apply to $1 ...
64# 77#
65ELT_walk_patches() { 78ELT_walk_patches() {
66 local x= 79 local x=
67 local y= 80 local y=
68 local ret=1 81 local ret=1
82 local file=$1
83 local patch_set=$2
69 local patch_dir= 84 local patch_dir=
70 local version= 85 local rem_int_dep=$3
71 local ltmain_sh=$1
72 86
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 87 if [[ -n ${patch_set} ]] ; then
78 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then 88 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
79 patch_dir="${ELT_PATCH_DIR}/$2" 89 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
80 else 90 else
81 return ${ret} 91 return "${ret}"
82 fi 92 fi
83 93
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) 94 # Go through the patches in reverse order (large to small)
90 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
91 if [[ -n ${x} && -f ${x} ]] ; then 96 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 ... 97 # For --remove-internal-dep ...
98 if [[ -n $3 ]] ; then 98 if [[ -n ${rem_int_dep} ]] ; then
99 # For replace @REM_INT_DEP@ with what was passed 99 # For replace @REM_INT_DEP@ with what was passed
100 # to --remove-internal-dep 100 # to --remove-internal-dep
101 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ 101 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
102 ${T}/$$.rem_int_deps.patch 102 "${T}/$$.rem_int_deps.patch"
103 103
104 x="${T}/$$.rem_int_deps.patch" 104 x="${T}/$$.rem_int_deps.patch"
105 fi 105 fi
106 106
107 if ELT_try_and_apply_patch "$1" "${x}" ; then 107 if ELT_try_and_apply_patch "${file}" "${x}" ; then
108 ret=0 108 ret=0
109 break 109 break
110 fi 110 fi
111 fi 111 fi
112 done 112 done
113 fi 113 fi
114 114
115 return ${ret} 115 return "${ret}"
116} 116}
117 117
118elibtoolize() { 118elibtoolize() {
119 local x= 119 local x=
120 local y= 120 local y=
122 local do_reversedeps="no" 122 local do_reversedeps="no"
123 local do_only_patches="no" 123 local do_only_patches="no"
124 local do_uclibc="yes" 124 local do_uclibc="yes"
125 local deptoremove= 125 local deptoremove=
126 local my_dirlist= 126 local my_dirlist=
127 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"
128 local start_dir="${PWD}" 128 local start_dir=${PWD}
129 129
130 my_dirlist="$(ELT_find_ltmain_sh)" 130 my_dirlist=$(ELT_find_ltmain_sh)
131 131
132 for x in "$@" ; do 132 for x in "$@" ; do
133 case "${x}" in 133 case "${x}" in
134 "--portage") 134 "--portage")
135 # Only apply portage patch, and don't 135 # Only apply portage patch, and don't
147 do_only_patches="yes" 147 do_only_patches="yes"
148 ;; 148 ;;
149 "^--remove-internal-dep="*) 149 "^--remove-internal-dep="*)
150 # We will replace @REM_INT_DEP@ with what is needed 150 # We will replace @REM_INT_DEP@ with what is needed
151 # in ELT_walk_patches() ... 151 # in ELT_walk_patches() ...
152 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" 152 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
153 153
154 # Add the patch for this ... 154 # Add the patch for this ...
155 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" 155 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
156 ;; 156 ;;
157 "--shallow") 157 "--shallow")
158 # Only patch the ltmain.sh in ${S} 158 # Only patch the ltmain.sh in ${S}
159 if [ -f "${S}/ltmain.sh" ] 159 if [[ -f ${S}/ltmain.sh ]] ; then
160 then
161 my_dirlist="${S}" 160 my_dirlist=${S}
162 else 161 else
163 my_dirlist= 162 my_dirlist=
164 fi 163 fi
165 ;; 164 ;;
166 "--no-uclibc") 165 "--no-uclibc")
167 do_uclibc="no" 166 do_uclibc="no"
168 ;; 167 ;;
169 *) 168 *)
170 eerror "Invalid elibtoolize option: $x" 169 eerror "Invalid elibtoolize option: ${x}"
171 die "elibtoolize called with $x ??" 170 die "elibtoolize called with ${x} ??"
172 esac 171 esac
173 done 172 done
174 173
175 [[ ${do_uclibc} == "yes" ]] && \ 174 [[ ${do_uclibc} == "yes" ]] && \
176 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf" 175 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
177 176
178 [[ ${CHOST} == *"-freebsd"* ]] && \ 177 [[ ${CHOST} == *"-freebsd"* ]] && \
179 elt_patches="${elt_patches} fbsd-conf" 178 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
180 179
181 if use ppc-macos ; then 180 [[ ${CHOST} == *"-darwin"* ]] && \
182 local opts 181 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
183 [[ -f Makefile.am ]] && opts="--automake"
184 glibtoolize --copy --force ${opts}
185 darwintoolize
186 fi
187 182
188 for x in ${my_dirlist} ; do 183 for x in ${my_dirlist} ; do
189 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 184 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
190 export ELT_APPLIED_PATCHES= 185 export ELT_APPLIED_PATCHES=
191 export ELT_LTMAIN_SH="${x}/ltmain.sh" 186 export ELT_LTMAIN_SH="${x}/ltmain.sh"
197 192
198 for y in ${elt_patches} ; do 193 for y in ${elt_patches} ; do
199 local ret=0 194 local ret=0
200 195
201 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 ;;
202 "rem-int-dep") 204 "rem-int-dep")
203 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 205 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
204 ret=$? 206 ret=$?
205 ;; 207 ;;
206 "fix-relink") 208 "fix-relink")
215 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 217 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
216 ELT_walk_patches "${x}/ltmain.sh" "${y}" 218 ELT_walk_patches "${x}/ltmain.sh" "${y}"
217 ret=$? 219 ret=$?
218 fi 220 fi
219 ;; 221 ;;
222 "as-needed")
223 ELT_walk_patches "${x}/ltmain.sh" "${y}"
224 ret=$?
225 ;;
220 "uclibc-conf") 226 "uclibc-conf")
221 if [[ -e ${x}/configure ]] && \ 227 if [[ -e ${x}/configure && \
222 grep 'Transform linux' "${x}/configure" > /dev/null ; then 228 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
223 ELT_walk_patches "${x}/configure" "${y}" 229 ELT_walk_patches "${x}/configure" "${y}"
224 ret=$? 230 ret=$?
225 # ltmain.sh and co might be in a subdirectory ... 231 # ltmain.sh and co might be in a subdirectory ...
226 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] && \ 232 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
227 grep 'Transform linux' "${x}/../configure" > /dev/null ; then 233 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
228 ELT_walk_patches "${x}/../configure" "${y}" 234 ELT_walk_patches "${x}/../configure" "${y}"
229 ret=$? 235 ret=$?
230 fi 236 fi
231 ;; 237 ;;
232 "uclibc-ltconf") 238 "uclibc-ltconf")
239 # Newer libtoolize clears ltconfig, as not used anymore
233 if [[ -e ${x}/ltconfig ]] ; then 240 if [[ -s ${x}/ltconfig ]] ; then
234 ELT_walk_patches "${x}/ltconfig" "${y}" 241 ELT_walk_patches "${x}/ltconfig" "${y}"
235 ret=$? 242 ret=$?
236 fi 243 fi
237 ;; 244 ;;
238 "fbsd-conf") 245 "fbsd-conf")
239 if [[ -e ${x}/configure ]] && \ 246 if [[ -e ${x}/configure && \
240 grep 'version_type=freebsd-' "${x}/configure" > /dev/null ; then 247 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
241 ELT_walk_patches "${x}/configure" "${y}" 248 ELT_walk_patches "${x}/configure" "${y}"
242 ret=$? 249 ret=$?
243 # ltmain.sh and co might be in a subdirectory ... 250 # ltmain.sh and co might be in a subdirectory ...
244 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] && \ 251 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
245 grep 'version_type=freebsd-' "${x}/../configure" > /dev/null ; then 252 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
246 ELT_walk_patches "${x}/../configure" "${y}" 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}"
247 ret=$? 277 ret=$?
248 fi 278 fi
249 ;; 279 ;;
250 *) 280 *)
251 ELT_walk_patches "${x}/ltmain.sh" "${y}" 281 ELT_walk_patches "${x}/ltmain.sh" "${y}"
254 esac 284 esac
255 285
256 if [[ ${ret} -ne 0 ]] ; then 286 if [[ ${ret} -ne 0 ]] ; then
257 case ${y} in 287 case ${y} in
258 "relink") 288 "relink")
289 local version=$(ELT_libtool_version "${x}/ltmain.sh")
259 # 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
260 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
261 ewarn " Could not apply relink.patch!" 294 ewarn " Could not apply relink.patch!"
262 fi 295 fi
263 ;; 296 ;;
264 "portage") 297 "portage")
265 # Critical patch - for this one we abort, as it can really 298 # Critical patch - for this one we abort, as it can really
267 if [[ ${do_portage} == "yes" ]] ; then 300 if [[ ${do_portage} == "yes" ]] ; then
268 # Stupid test to see if its already applied ... 301 # Stupid test to see if its already applied ...
269 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
270 echo 303 echo
271 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."
272 die "Portage patch requested, but failed to apply!" 306 die "Portage patch requested, but failed to apply!"
273 fi 307 fi
274 else 308 else
275 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
276 # ewarn " Portage patch seems to be already applied." 310 # ewarn " Portage patch seems to be already applied."
281 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \ 315 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
282 echo "${VERSION}") 316 echo "${VERSION}")
283 317
284 echo 318 echo
285 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."
286 die "Portage patch failed to apply!" 321 die "Portage patch failed to apply!"
287 fi 322 fi
288 # We do not want to run libtoolize ... 323 # We do not want to run libtoolize ...
289 ELT_APPLIED_PATCHES="portage" 324 ELT_APPLIED_PATCHES="portage"
290 fi 325 fi
292 "uclibc-"*) 327 "uclibc-"*)
293 [[ ${CHOST} == *"-uclibc" ]] && \ 328 [[ ${CHOST} == *"-uclibc" ]] && \
294 ewarn " uClibc patch set '${y}' failed to apply!" 329 ewarn " uClibc patch set '${y}' failed to apply!"
295 ;; 330 ;;
296 "fbsd-"*) 331 "fbsd-"*)
297 [[ ${CHOST} == *"-freebsd"* ]] && \ 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
298 eerror " FreeBSD patch set '${y}' failed to apply!" 335 eerror " FreeBSD patch set '${y}' failed to apply!"
299 die "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!"
300 ;; 343 ;;
301 esac 344 esac
302 fi 345 fi
303 done 346 done
304 347
307 ${do_reversedeps} == "no" && \ 350 ${do_reversedeps} == "no" && \
308 ${do_only_patches} == "no" && \ 351 ${do_only_patches} == "no" && \
309 ${deptoremove} == "" ]] 352 ${deptoremove} == "" ]]
310 then 353 then
311 ewarn "Cannot apply any patches, please file a bug about this" 354 ewarn "Cannot apply any patches, please file a bug about this"
312 break
313
314 # Sometimes ltmain.sh is in a subdirectory ...
315 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
316 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
317 cd "${x}"/../
318 fi
319 fi 355 die
320
321 if type -p libtoolize &> /dev/null ; then
322 ewarn "Cannot apply any patches, running libtoolize..."
323 libtoolize --copy --force
324 fi
325 cd "${x}"
326 break
327 fi 356 fi
328 fi 357 fi
329 358
330 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 359 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
331 360
332 touch "${x}/.elibtoolized" 361 >> "${x}/.elibtoolized"
333 done 362 done
334 363
335 cd "${start_dir}" 364 cd "${start_dir}"
336} 365}
337 366
338uclibctoolize() { 367uclibctoolize() {
339 ewarn "uclibctoolize() is depreciated, please just use libtoolize()!" 368 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
340 elibtoolize 369 elibtoolize
341} 370}
342 371
343darwintoolize() { 372darwintoolize() {
344 local targets="" 373 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
345 local x 374 elibtoolize
346
347 if [[ -z $* ]] ; then
348 targets=$(find ${S} -name ltmain.sh -o -name ltconfig)
349 fi
350
351 einfo "Applying Darwin/libtool patches ..."
352 for x in ${targets} ; do
353 [[ ! -s ${x} ]] && continue
354 case ${x##*/} in
355 ltmain.sh|ltconfig)
356 local ver=$(grep '^VERSION=' ${x})
357 ver=${ver/VERSION=}
358 if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then
359 ver="1.3" # 1.4, 1.5 and 1.3 are compat
360 fi
361
362 ebegin " Fixing \${S}${x/${S}}"
363 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null
364 eend $? "PLEASE CHECK ${x}"
365 ;;
366 esac
367 done
368} 375}
369 376
370# char *VER_major(string) 377# char *VER_major(string)
371# 378#
372# Return the Major (X of X.Y.Z) version 379# Return the Major (X of X.Y.Z) version
373# 380#
374VER_major() { 381VER_major() {
375 [[ -z $1 ]] && return 1 382 [[ -z $1 ]] && return 1
376 383
377 local VER=$@ 384 local VER=$@
378 echo ${VER%%[^[:digit:]]*} 385 echo "${VER%%[^[:digit:]]*}"
379} 386}
380 387
381# char *VER_minor(string) 388# char *VER_minor(string)
382# 389#
383# Return the Minor (Y of X.Y.Z) version 390# Return the Minor (Y of X.Y.Z) version
385VER_minor() { 392VER_minor() {
386 [[ -z $1 ]] && return 1 393 [[ -z $1 ]] && return 1
387 394
388 local VER=$@ 395 local VER=$@
389 VER=${VER#*.} 396 VER=${VER#*.}
390 echo ${VER%%[^[:digit:]]*} 397 echo "${VER%%[^[:digit:]]*}"
391} 398}
392 399
393# char *VER_micro(string) 400# char *VER_micro(string)
394# 401#
395# Return the Micro (Z of X.Y.Z) version. 402# Return the Micro (Z of X.Y.Z) version.
397VER_micro() { 404VER_micro() {
398 [[ -z $1 ]] && return 1 405 [[ -z $1 ]] && return 1
399 406
400 local VER=$@ 407 local VER=$@
401 VER=${VER#*.*.} 408 VER=${VER#*.*.}
402 echo ${VER%%[^[:digit:]]*} 409 echo "${VER%%[^[:digit:]]*}"
403} 410}
404 411
405# int VER_to_int(string) 412# int VER_to_int(string)
406# 413#
407# 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.56  
changed lines
  Added in v.1.83

  ViewVC Help
Powered by ViewVC 1.1.20