/[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.86
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.51 2005/09/02 09:35:17 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.86 2010/04/14 02:13:54 vapier 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 patch
66 local y=
67 local ret=1 80 local ret=1
81 local file=$1
68 local patch_dir= 82 local patch_set=$2
69 local version=$(eval $(grep -e '^[[:space:]]*VERSION=' $1); \
70 echo "${VERSION}")
71
72 if [[ -n $2 ]] ; then
73 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then
74 patch_dir="${ELT_PATCH_DIR}/$2" 83 local patch_dir="${ELT_PATCH_DIR}/${patch_set}"
75 else 84 local rem_int_dep=$3
76 return ${ret} 85
86 [[ -z ${patch_set} ]] && return 1
87 [[ ! -d ${patch_dir} ]] && return 1
88
89 pushd "${ELT_PATCH_DIR}" >/dev/null
90
91 # Go through the patches in reverse order (newer version to older)
92 for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do
93 # For --remove-internal-dep ...
94 if [[ -n ${rem_int_dep} ]] ; then
95 # For replace @REM_INT_DEP@ with what was passed
96 # to --remove-internal-dep
97 local tmp="${T}/$$.rem_int_deps.patch"
98 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" "${patch}" > "${tmp}"
99 patch=${tmp}
77 fi 100 fi
78 101
79 if [[ -z ${version} ]] ; then 102 if ELT_try_and_apply_patch "${file}" "${patch}" ; then
80 eerror "Could not get VERSION for ${1##*/}!" 103 # Break to unwind w/popd rather than return directly
81 die "Could not get VERSION for ${1##*/}!" 104 ret=0
105 break
82 fi 106 fi
83
84 # Go through the patches in reverse order (large to small)
85 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | sort -r) ; do
86 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 ...
93 if [[ -n $3 ]] ; then
94 # For replace @REM_INT_DEP@ with what was passed
95 # to --remove-internal-dep
96 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \
97 ${T}/$$.rem_int_deps.patch
98
99 x="${T}/$$.rem_int_deps.patch"
100 fi
101
102 if ELT_try_and_apply_patch "$1" "${x}" ; then
103 ret=0
104 break
105 fi
106 fi
107 done 107 done
108 fi
109 108
109 popd "${patch_dir}" >/dev/null
110 return ${ret} 110 return ${ret}
111} 111}
112 112
113elibtoolize() { 113elibtoolize() {
114 local x= 114 local x=
115 local y= 115 local y=
116 local do_portage="no" 116 local do_portage="no"
117 local do_reversedeps="no" 117 local do_reversedeps="no"
118 local do_only_patches="no" 118 local do_only_patches="no"
119 local do_uclibc="yes"
119 local deptoremove= 120 local deptoremove=
120 local my_dirlist= 121 local my_dirlist=
121 local elt_patches="portage relink max_cmd_len sed test tmp" 122 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
122 local start_dir="${PWD}" 123 local start_dir=${PWD}
123 124
124 my_dirlist="$(ELT_find_ltmain_sh)" 125 my_dirlist=$(ELT_find_ltmain_sh)
125 126
126 for x in "$@" ; do 127 for x in "$@" ; do
127 case "${x}" in 128 case "${x}" in
128 "--portage") 129 "--portage")
129 # Only apply portage patch, and don't 130 # Only apply portage patch, and don't
141 do_only_patches="yes" 142 do_only_patches="yes"
142 ;; 143 ;;
143 "^--remove-internal-dep="*) 144 "^--remove-internal-dep="*)
144 # We will replace @REM_INT_DEP@ with what is needed 145 # We will replace @REM_INT_DEP@ with what is needed
145 # in ELT_walk_patches() ... 146 # in ELT_walk_patches() ...
146 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" 147 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
147 148
148 # Add the patch for this ... 149 # Add the patch for this ...
149 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" 150 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
150 ;; 151 ;;
151 "--shallow") 152 "--shallow")
152 # Only patch the ltmain.sh in ${S} 153 # Only patch the ltmain.sh in ${S}
153 if [ -f "${S}/ltmain.sh" ] 154 if [[ -f ${S}/ltmain.sh ]] ; then
154 then
155 my_dirlist="${S}" 155 my_dirlist=${S}
156 else 156 else
157 my_dirlist= 157 my_dirlist=
158 fi 158 fi
159 ;; 159 ;;
160 "--no-uclibc") 160 "--no-uclibc")
161 NO_UCLIBCTOOLIZE=1 161 do_uclibc="no"
162 ;; 162 ;;
163 *) 163 *)
164 eerror "Invalid elibtoolize option: $x" 164 eerror "Invalid elibtoolize option: ${x}"
165 die "elibtoolize called with $x ??" 165 die "elibtoolize called with ${x} ??"
166 esac 166 esac
167 done 167 done
168 168
169 if use ppc-macos ; then 169 [[ ${do_uclibc} == "yes" ]] && \
170 local opts 170 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
171 [[ -f Makefile.am ]] && opts="--automake" 171
172 glibtoolize --copy --force ${opts} 172 case "${CHOST}" in
173 darwintoolize 173 *-aix*)
174 fi 174 elt_patches="${elt_patches} hardcode aixrtl"
175 ;;
176 *-darwin*)
177 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain darwin-conf"
178 ;;
179 *-freebsd*)
180 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
181 ;;
182 *-hpux*)
183 elt_patches="${elt_patches} hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc"
184 ;;
185 *-irix*)
186 elt_patches="${elt_patches} irix-ltmain"
187 ;;
188 *-mint*)
189 elt_patches="${elt_patches} mint-conf"
190 ;;
191 esac
175 192
176 for x in ${my_dirlist} ; do 193 for x in ${my_dirlist} ; do
177 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 194 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
178 export ELT_APPLIED_PATCHES= 195 export ELT_APPLIED_PATCHES=
196 export ELT_LTMAIN_SH="${x}/ltmain.sh"
197
198 [[ -f ${x}/.elibtoolized ]] && continue
179 199
180 cd ${x} 200 cd ${x}
181 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')" 201 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
182 202
183 for y in ${elt_patches} ; do 203 for y in ${elt_patches} ; do
184 local ret=0 204 local ret=0
185 205
186 case "${y}" in 206 case "${y}" in
207 "portage")
208 # Stupid test to see if its already applied ...
209 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
210 ELT_walk_patches "${x}/ltmain.sh" "${y}"
211 ret=$?
212 fi
213 ;;
187 "rem-int-dep") 214 "rem-int-dep")
188 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 215 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
189 ret=$? 216 ret=$?
190 ;; 217 ;;
191 "fix-relink") 218 "fix-relink")
200 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 227 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
201 ELT_walk_patches "${x}/ltmain.sh" "${y}" 228 ELT_walk_patches "${x}/ltmain.sh" "${y}"
202 ret=$? 229 ret=$?
203 fi 230 fi
204 ;; 231 ;;
232 "as-needed")
233 ELT_walk_patches "${x}/ltmain.sh" "${y}"
234 ret=$?
235 ;;
236 "uclibc-conf")
237 if [[ -e ${x}/configure && \
238 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
239 ELT_walk_patches "${x}/configure" "${y}"
240 ret=$?
241 # ltmain.sh and co might be in a subdirectory ...
242 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
243 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
244 ELT_walk_patches "${x}/../configure" "${y}"
245 ret=$?
246 fi
247 ;;
248 "uclibc-ltconf")
249 # Newer libtoolize clears ltconfig, as not used anymore
250 if [[ -s ${x}/ltconfig ]] ; then
251 ELT_walk_patches "${x}/ltconfig" "${y}"
252 ret=$?
253 fi
254 ;;
255 "fbsd-conf")
256 if [[ -e ${x}/configure && \
257 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
258 ELT_walk_patches "${x}/configure" "${y}"
259 ret=$?
260 # ltmain.sh and co might be in a subdirectory ...
261 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
262 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
263 ELT_walk_patches "${x}/../configure" "${y}"
264 ret=$?
265 fi
266 ;;
267 "fbsd-ltconf")
268 if [[ -s ${x}/ltconfig ]] ; then
269 ELT_walk_patches "${x}/ltconfig" "${y}"
270 ret=$?
271 fi
272 ;;
273 "darwin-conf")
274 if [[ -e ${x}/configure && \
275 -n $(grep '&& echo \.so ||' "${x}/configure") ]] ; then
276 ELT_walk_patches "${x}/configure" "${y}"
277 ret=$?
278 # ltmain.sh and co might be in a subdirectory ...
279 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
280 -n $(grep '&& echo \.so ||' "${x}/../configure") ]] ; then
281 ELT_walk_patches "${x}/../configure" "${y}"
282 ret=$?
283 fi
284 ;;
285 "darwin-ltconf")
286 # Newer libtoolize clears ltconfig, as not used anymore
287 if [[ -s ${x}/ltconfig ]] ; then
288 ELT_walk_patches "${x}/ltconfig" "${y}"
289 ret=$?
290 fi
291 ;;
292 "darwin-ltmain")
293 # special case to avoid false positives (failing to apply
294 # ltmain.sh path message), newer libtools have this patch
295 # built in, so not much to patch around then
296 if [[ -e ${x}/ltmain.sh && \
297 -z $(grep 'verstring="-compatibility_version' "${x}/ltmain.sh") ]] ; then
298 ELT_walk_patches "${x}/ltmain.sh" "${y}"
299 ret=$?
300 fi
301 ;;
302 "aixrtl" | "hpux-conf")
303 ret=1
304 local subret=0
305 # apply multiple patches as often as they match
306 while [[ $subret -eq 0 ]]; do
307 subret=1
308 if [[ -e ${x}/configure ]]; then
309 ELT_walk_patches "${x}/configure" "${y}"
310 subret=$?
311 # ltmain.sh and co might be in a subdirectory ...
312 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then
313 ELT_walk_patches "${x}/../configure" "${y}"
314 subret=$?
315 fi
316 if [[ $subret -eq 0 ]]; then
317 # have at least one patch succeeded.
318 ret=0
319 fi
320 done
321 ;;
322 "mint-conf")
323 ret=1
324 local subret=1
325 if [[ -e ${x}/configure ]]; then
326 ELT_walk_patches "${x}/configure" "${y}"
327 subret=$?
328 # ltmain.sh and co might be in a subdirectory ...
329 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then
330 ELT_walk_patches "${x}/../configure" "${y}"
331 subret=$?
332 fi
333 if [[ $subret -eq 0 ]]; then
334 # have at least one patch succeeded.
335 ret=0
336 fi
337 ;;
338 "install-sh")
339 ELT_walk_patches "${x}/install-sh" "${y}"
340 ret=$?
341 ;;
342 "cross")
343 if tc-is-cross-compiler ; then
344 ELT_walk_patches "${x}/ltmain.sh" "${y}"
345 ret=$?
346 fi
347 ;;
205 *) 348 *)
206 ELT_walk_patches "${x}/ltmain.sh" "${y}" 349 ELT_walk_patches "${x}/ltmain.sh" "${y}"
207 ret=$? 350 ret=$?
208 ;; 351 ;;
209 esac 352 esac
210 353
211 if [[ ${ret} -ne 0 ]] ; then 354 if [[ ${ret} -ne 0 ]] ; then
212 case ${y} in 355 case ${y} in
213 "relink") 356 "relink")
357 local version=$(ELT_libtool_version "${x}/ltmain.sh")
214 # Critical patch, but could be applied ... 358 # Critical patch, but could be applied ...
359 # FIXME: Still need a patch for ltmain.sh > 1.4.0
215 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 360 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
361 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
216 ewarn " Could not apply relink.patch!" 362 ewarn " Could not apply relink.patch!"
217 fi 363 fi
218 ;; 364 ;;
219 "portage") 365 "portage")
220 # Critical patch - for this one we abort, as it can really 366 # Critical patch - for this one we abort, as it can really
222 if [[ ${do_portage} == "yes" ]] ; then 368 if [[ ${do_portage} == "yes" ]] ; then
223 # Stupid test to see if its already applied ... 369 # Stupid test to see if its already applied ...
224 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 370 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
225 echo 371 echo
226 eerror "Portage patch requested, but failed to apply!" 372 eerror "Portage patch requested, but failed to apply!"
373 eerror "Please bug azarah or vapier to add proper patch."
227 die "Portage patch requested, but failed to apply!" 374 die "Portage patch requested, but failed to apply!"
228 fi 375 fi
229 else 376 else
230 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 377 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
231 # ewarn " Portage patch seems to be already applied." 378 # ewarn " Portage patch seems to be already applied."
236 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \ 383 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
237 echo "${VERSION}") 384 echo "${VERSION}")
238 385
239 echo 386 echo
240 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 387 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
388 eerror "Please bug azarah or vapier to add proper patch."
241 die "Portage patch failed to apply!" 389 die "Portage patch failed to apply!"
242 fi 390 fi
243 # We do not want to run libtoolize ... 391 # We do not want to run libtoolize ...
244 ELT_APPLIED_PATCHES="portage" 392 ELT_APPLIED_PATCHES="portage"
245 fi 393 fi
246 ;; 394 ;;
395 "uclibc-"*)
396 [[ ${CHOST} == *"-uclibc" ]] && \
397 ewarn " uClibc patch set '${y}' failed to apply!"
398 ;;
399 "fbsd-"*)
400 if [[ ${CHOST} == *"-freebsd"* ]] ; then
401 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
402 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
403 eerror " FreeBSD patch set '${y}' failed to apply!"
404 die "FreeBSD patch set '${y}' failed to apply!"
405 fi
406 fi
407 ;;
408 "darwin-"*)
409 [[ ${CHOST} == *"-darwin"* ]] && \
410 ewarn " Darwin patch set '${y}' failed to apply!"
411 ;;
247 esac 412 esac
248 fi 413 fi
414 done
249 415
250 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then 416 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
251 if [[ ${do_portage} == "no" && \ 417 if [[ ${do_portage} == "no" && \
252 ${do_reversedeps} == "no" && \ 418 ${do_reversedeps} == "no" && \
253 ${do_only_patches} == "no" && \ 419 ${do_only_patches} == "no" && \
254 ${deptoremove} == "" ]] 420 ${deptoremove} == "" ]]
255 then 421 then
256 ewarn "Cannot apply any patches, please file a bug about this" 422 ewarn "Cannot apply any patches, please file a bug about this"
257 break
258
259 # Sometimes ltmain.sh is in a subdirectory ...
260 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
261 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
262 cd "${x}"/../
263 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 423 die
273 fi 424 fi
274 done 425 fi
426
427 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
428
429 >> "${x}/.elibtoolized"
275 done 430 done
276 431
277 if [[ -f libtool ]] ; then
278 rm -f libtool
279 fi
280
281 cd "${start_dir}" 432 cd "${start_dir}"
282
283 uclibctoolize
284} 433}
285 434
286uclibctoolize() { 435uclibctoolize() {
287 [[ -n ${NO_UCLIBCTOOLIZE} ]] && return 0 436 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
288 437 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} 438}
323 439
324darwintoolize() { 440darwintoolize() {
325 local targets="" 441 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
326 local x 442 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} 443}
350 444
351# char *VER_major(string) 445# char *VER_major(string)
352# 446#
353# Return the Major (X of X.Y.Z) version 447# Return the Major (X of X.Y.Z) version
354# 448#
355VER_major() { 449VER_major() {
356 [[ -z $1 ]] && return 1 450 [[ -z $1 ]] && return 1
357 451
358 local VER=$@ 452 local VER=$@
359 echo ${VER%%[^[:digit:]]*} 453 echo "${VER%%[^[:digit:]]*}"
360} 454}
361 455
362# char *VER_minor(string) 456# char *VER_minor(string)
363# 457#
364# Return the Minor (Y of X.Y.Z) version 458# Return the Minor (Y of X.Y.Z) version
366VER_minor() { 460VER_minor() {
367 [[ -z $1 ]] && return 1 461 [[ -z $1 ]] && return 1
368 462
369 local VER=$@ 463 local VER=$@
370 VER=${VER#*.} 464 VER=${VER#*.}
371 echo ${VER%%[^[:digit:]]*} 465 echo "${VER%%[^[:digit:]]*}"
372} 466}
373 467
374# char *VER_micro(string) 468# char *VER_micro(string)
375# 469#
376# Return the Micro (Z of X.Y.Z) version. 470# Return the Micro (Z of X.Y.Z) version.
378VER_micro() { 472VER_micro() {
379 [[ -z $1 ]] && return 1 473 [[ -z $1 ]] && return 1
380 474
381 local VER=$@ 475 local VER=$@
382 VER=${VER#*.*.} 476 VER=${VER#*.*.}
383 echo ${VER%%[^[:digit:]]*} 477 echo "${VER%%[^[:digit:]]*}"
384} 478}
385 479
386# int VER_to_int(string) 480# int VER_to_int(string)
387# 481#
388# Convert a string type version (2.4.0) to an int (132096) 482# Convert a string type version (2.4.0) to an int (132096)

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

  ViewVC Help
Powered by ViewVC 1.1.20