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

Diff of /eclass/libtool.eclass

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

Revision 1.55 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.55 2005/09/04 18:40:48 flameeyes 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=
121 local do_portage="no" 121 local do_portage="no"
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 deptoremove= 125 local deptoremove=
125 local my_dirlist= 126 local my_dirlist=
126 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"
127 uclibc-conf uclibc-ltconf"
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
132 [[ ${CHOST} == *"-freebsd"* ]] && \
133 elt_patches="${elt_patches} fbsd-conf"
134 131
135 for x in "$@" ; do 132 for x in "$@" ; do
136 case "${x}" in 133 case "${x}" in
137 "--portage") 134 "--portage")
138 # Only apply portage patch, and don't 135 # Only apply portage patch, and don't
150 do_only_patches="yes" 147 do_only_patches="yes"
151 ;; 148 ;;
152 "^--remove-internal-dep="*) 149 "^--remove-internal-dep="*)
153 # We will replace @REM_INT_DEP@ with what is needed 150 # We will replace @REM_INT_DEP@ with what is needed
154 # in ELT_walk_patches() ... 151 # in ELT_walk_patches() ...
155 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" 152 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
156 153
157 # Add the patch for this ... 154 # Add the patch for this ...
158 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" 155 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
159 ;; 156 ;;
160 "--shallow") 157 "--shallow")
161 # Only patch the ltmain.sh in ${S} 158 # Only patch the ltmain.sh in ${S}
162 if [ -f "${S}/ltmain.sh" ] 159 if [[ -f ${S}/ltmain.sh ]] ; then
163 then
164 my_dirlist="${S}" 160 my_dirlist=${S}
165 else 161 else
166 my_dirlist= 162 my_dirlist=
167 fi 163 fi
168 ;; 164 ;;
169 "--no-uclibc") 165 "--no-uclibc")
170 NO_UCLIBCTOOLIZE=1 166 do_uclibc="no"
171 ;; 167 ;;
172 *) 168 *)
173 eerror "Invalid elibtoolize option: $x" 169 eerror "Invalid elibtoolize option: ${x}"
174 die "elibtoolize called with $x ??" 170 die "elibtoolize called with ${x} ??"
175 esac 171 esac
176 done 172 done
177 173
178 if use ppc-macos ; then 174 [[ ${do_uclibc} == "yes" ]] && \
179 local opts 175 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
180 [[ -f Makefile.am ]] && opts="--automake" 176
181 glibtoolize --copy --force ${opts} 177 [[ ${CHOST} == *"-freebsd"* ]] && \
182 darwintoolize 178 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
183 fi 179
180 [[ ${CHOST} == *"-darwin"* ]] && \
181 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
184 182
185 for x in ${my_dirlist} ; do 183 for x in ${my_dirlist} ; do
186 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 184 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
187 export ELT_APPLIED_PATCHES= 185 export ELT_APPLIED_PATCHES=
188 export ELT_LTMAIN_SH="${x}/ltmain.sh" 186 export ELT_LTMAIN_SH="${x}/ltmain.sh"
194 192
195 for y in ${elt_patches} ; do 193 for y in ${elt_patches} ; do
196 local ret=0 194 local ret=0
197 195
198 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 ;;
199 "rem-int-dep") 204 "rem-int-dep")
200 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 205 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
201 ret=$? 206 ret=$?
202 ;; 207 ;;
203 "fix-relink") 208 "fix-relink")
212 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 217 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
213 ELT_walk_patches "${x}/ltmain.sh" "${y}" 218 ELT_walk_patches "${x}/ltmain.sh" "${y}"
214 ret=$? 219 ret=$?
215 fi 220 fi
216 ;; 221 ;;
222 "as-needed")
223 ELT_walk_patches "${x}/ltmain.sh" "${y}"
224 ret=$?
225 ;;
217 "uclibc-conf") 226 "uclibc-conf")
218 if [[ -e ${x}/configure ]] && \ 227 if [[ -e ${x}/configure && \
219 grep 'Transform linux' "${x}/configure" > /dev/null ; then 228 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
220 ELT_walk_patches "${x}/configure" "${y}" 229 ELT_walk_patches "${x}/configure" "${y}"
221 ret=$? 230 ret=$?
222 # ltmain.sh and co might be in a subdirectory ... 231 # ltmain.sh and co might be in a subdirectory ...
223 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] && \ 232 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
224 grep 'Transform linux' "${x}/../configure" > /dev/null ; then 233 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
225 ELT_walk_patches "${x}/../configure" "${y}" 234 ELT_walk_patches "${x}/../configure" "${y}"
226 ret=$? 235 ret=$?
227 fi 236 fi
228 ;; 237 ;;
229 "uclibc-ltconf") 238 "uclibc-ltconf")
239 # Newer libtoolize clears ltconfig, as not used anymore
230 if [[ -e ${x}/ltconfig ]] ; then 240 if [[ -s ${x}/ltconfig ]] ; then
231 ELT_walk_patches "${x}/ltconfig" "${y}" 241 ELT_walk_patches "${x}/ltconfig" "${y}"
232 ret=$? 242 ret=$?
233 fi 243 fi
234 ;; 244 ;;
235 "fbsd-conf") 245 "fbsd-conf")
236 if [[ -e ${x}/configure ]] && \ 246 if [[ -e ${x}/configure && \
237 grep 'version_type=freebsd-' "${x}/configure" > /dev/null ; then 247 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
238 ELT_walk_patches "${x}/configure" "${y}" 248 ELT_walk_patches "${x}/configure" "${y}"
239 ret=$? 249 ret=$?
240 # ltmain.sh and co might be in a subdirectory ... 250 # ltmain.sh and co might be in a subdirectory ...
241 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] && \ 251 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
242 grep 'version_type=freebsd-' "${x}/../configure" > /dev/null ; then 252 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
243 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}"
244 ret=$? 277 ret=$?
245 fi 278 fi
246 ;; 279 ;;
247 *) 280 *)
248 ELT_walk_patches "${x}/ltmain.sh" "${y}" 281 ELT_walk_patches "${x}/ltmain.sh" "${y}"
251 esac 284 esac
252 285
253 if [[ ${ret} -ne 0 ]] ; then 286 if [[ ${ret} -ne 0 ]] ; then
254 case ${y} in 287 case ${y} in
255 "relink") 288 "relink")
289 local version=$(ELT_libtool_version "${x}/ltmain.sh")
256 # 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
257 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
258 ewarn " Could not apply relink.patch!" 294 ewarn " Could not apply relink.patch!"
259 fi 295 fi
260 ;; 296 ;;
261 "portage") 297 "portage")
262 # Critical patch - for this one we abort, as it can really 298 # Critical patch - for this one we abort, as it can really
264 if [[ ${do_portage} == "yes" ]] ; then 300 if [[ ${do_portage} == "yes" ]] ; then
265 # Stupid test to see if its already applied ... 301 # Stupid test to see if its already applied ...
266 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
267 echo 303 echo
268 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."
269 die "Portage patch requested, but failed to apply!" 306 die "Portage patch requested, but failed to apply!"
270 fi 307 fi
271 else 308 else
272 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
273 # ewarn " Portage patch seems to be already applied." 310 # ewarn " Portage patch seems to be already applied."
278 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \ 315 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
279 echo "${VERSION}") 316 echo "${VERSION}")
280 317
281 echo 318 echo
282 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."
283 die "Portage patch failed to apply!" 321 die "Portage patch failed to apply!"
284 fi 322 fi
285 # We do not want to run libtoolize ... 323 # We do not want to run libtoolize ...
286 ELT_APPLIED_PATCHES="portage" 324 ELT_APPLIED_PATCHES="portage"
287 fi 325 fi
289 "uclibc-"*) 327 "uclibc-"*)
290 [[ ${CHOST} == *"-uclibc" ]] && \ 328 [[ ${CHOST} == *"-uclibc" ]] && \
291 ewarn " uClibc patch set '${y}' failed to apply!" 329 ewarn " uClibc patch set '${y}' failed to apply!"
292 ;; 330 ;;
293 "fbsd-"*) 331 "fbsd-"*)
294 [[ ${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
295 eerror " FreeBSD patch set '${y}' failed to apply!" 335 eerror " FreeBSD patch set '${y}' failed to apply!"
296 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!"
297 ;; 343 ;;
298 esac 344 esac
299 fi 345 fi
300 done 346 done
301 347
304 ${do_reversedeps} == "no" && \ 350 ${do_reversedeps} == "no" && \
305 ${do_only_patches} == "no" && \ 351 ${do_only_patches} == "no" && \
306 ${deptoremove} == "" ]] 352 ${deptoremove} == "" ]]
307 then 353 then
308 ewarn "Cannot apply any patches, please file a bug about this" 354 ewarn "Cannot apply any patches, please file a bug about this"
309 break
310
311 # Sometimes ltmain.sh is in a subdirectory ...
312 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
313 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
314 cd "${x}"/../
315 fi
316 fi 355 die
317
318 if type -p libtoolize &> /dev/null ; then
319 ewarn "Cannot apply any patches, running libtoolize..."
320 libtoolize --copy --force
321 fi
322 cd "${x}"
323 break
324 fi 356 fi
325 fi 357 fi
326 358
327 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 359 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
328 360
329 touch "${x}/.elibtoolized" 361 >> "${x}/.elibtoolized"
330 done 362 done
331 363
332 cd "${start_dir}" 364 cd "${start_dir}"
333} 365}
334 366
335uclibctoolize() { 367uclibctoolize() {
336 ewarn "uclibctoolize() is depreciated, please just use libtoolize()!" 368 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
337 elibtoolize 369 elibtoolize
338} 370}
339 371
340darwintoolize() { 372darwintoolize() {
341 local targets="" 373 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
342 local x 374 elibtoolize
343
344 if [[ -z $* ]] ; then
345 targets=$(find ${S} -name ltmain.sh -o -name ltconfig)
346 fi
347
348 einfo "Applying Darwin/libtool patches ..."
349 for x in ${targets} ; do
350 [[ ! -s ${x} ]] && continue
351 case ${x##*/} in
352 ltmain.sh|ltconfig)
353 local ver=$(grep '^VERSION=' ${x})
354 ver=${ver/VERSION=}
355 if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then
356 ver="1.3" # 1.4, 1.5 and 1.3 are compat
357 fi
358
359 ebegin " Fixing \${S}${x/${S}}"
360 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null
361 eend $? "PLEASE CHECK ${x}"
362 ;;
363 esac
364 done
365} 375}
366 376
367# char *VER_major(string) 377# char *VER_major(string)
368# 378#
369# Return the Major (X of X.Y.Z) version 379# Return the Major (X of X.Y.Z) version
370# 380#
371VER_major() { 381VER_major() {
372 [[ -z $1 ]] && return 1 382 [[ -z $1 ]] && return 1
373 383
374 local VER=$@ 384 local VER=$@
375 echo ${VER%%[^[:digit:]]*} 385 echo "${VER%%[^[:digit:]]*}"
376} 386}
377 387
378# char *VER_minor(string) 388# char *VER_minor(string)
379# 389#
380# Return the Minor (Y of X.Y.Z) version 390# Return the Minor (Y of X.Y.Z) version
382VER_minor() { 392VER_minor() {
383 [[ -z $1 ]] && return 1 393 [[ -z $1 ]] && return 1
384 394
385 local VER=$@ 395 local VER=$@
386 VER=${VER#*.} 396 VER=${VER#*.}
387 echo ${VER%%[^[:digit:]]*} 397 echo "${VER%%[^[:digit:]]*}"
388} 398}
389 399
390# char *VER_micro(string) 400# char *VER_micro(string)
391# 401#
392# Return the Micro (Z of X.Y.Z) version. 402# Return the Micro (Z of X.Y.Z) version.
394VER_micro() { 404VER_micro() {
395 [[ -z $1 ]] && return 1 405 [[ -z $1 ]] && return 1
396 406
397 local VER=$@ 407 local VER=$@
398 VER=${VER#*.*.} 408 VER=${VER#*.*.}
399 echo ${VER%%[^[:digit:]]*} 409 echo "${VER%%[^[:digit:]]*}"
400} 410}
401 411
402# int VER_to_int(string) 412# int VER_to_int(string)
403# 413#
404# 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.55  
changed lines
  Added in v.1.83

  ViewVC Help
Powered by ViewVC 1.1.20