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

Diff of /eclass/libtool.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20