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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.51  
changed lines
  Added in v.1.65

  ViewVC Help
Powered by ViewVC 1.1.20