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

Diff of /eclass/libtool.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20