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

Diff of /eclass/libtool.eclass

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

Revision 1.8 Revision 1.47
1#!/bin/bash 1# Copyright 1999-2005 Gentoo Foundation
2# Copyright 1999-2002 Gentoo Technologies, Inc.
3# Distributed under the terms of the GNU General Public License, v2 or later 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.47 2005/05/27 23:46:13 vapier Exp $
4#
4# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
5# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.8 2002/06/26 20:17:53 azarah Exp $ 6#
6# This eclass patches ltmain.sh distributed with libtoolized packages with the 7# This eclass patches ltmain.sh distributed with libtoolized packages with the
7# relink and portage patch 8# relink and portage patch among others
9
8ECLASS=libtool 10ECLASS="libtool"
9newdepend sys-devel/libtool 11INHERITED="${INHERITED} ${ECLASS}"
12
13# 2004.09.25 rac
14# i have verified that at least one package can use this eclass and
15# build properly even without libtool installed yet, probably using
16# the files in the distribution. eliminating this dependency fixes
17# bug 65209, which is a showstopper for people doing installs using
18# stageballs <3. if anybody decides to revert this, please attempt
19# to find an alternate way of resolving that bug at the same time.
10 20
11DESCRIPTION="Based on the ${ECLASS} eclass" 21DESCRIPTION="Based on the ${ECLASS} eclass"
12 22
23ELIBTOOL_VERSION="2.0.2"
24
25ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches"
26ELT_APPLIED_PATCHES=
27
28#
29# Returns all the directories containing ltmain.sh
30#
31ELT_find_ltmain_sh() {
32 local x=
33 local dirlist=
34
35 for x in $(find "${S}" -name 'ltmain.sh') ; do
36 dirlist="${dirlist} ${x%/*}"
37 done
38
39 echo "${dirlist}"
40}
41
42#
43# See if we can apply $2 on $1, and if so, do it
44#
45ELT_try_and_apply_patch() {
46 local ret=0
47 local patch="$2"
48
49 # We only support patchlevel of 0 - why worry if its static patches?
50 if patch -p0 --dry-run $1 < ${patch} &> ${T}/elibtool.log ; then
51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
52 patch -p0 $1 < ${patch} &>${T}/elibtool.log
53 ret=$?
54 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
55 else
56 ret=1
57 fi
58
59 return ${ret}
60}
61
62#
63# Run through the patches in $2 and see if any
64# apply to $1 ...
65#
66ELT_walk_patches() {
67 local x=
68 local y=
69 local ret=1
70 local patch_dir=
71 local version=$(eval $(grep -e '^[[:space:]]*VERSION=' $1); \
72 echo "${VERSION}")
73
74 if [[ -n $2 ]] ; then
75 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then
76 patch_dir="${ELT_PATCH_DIR}/$2"
77 else
78 return ${ret}
79 fi
80
81 if [[ -z ${version} ]] ; then
82 eerror "Could not get VERSION for ${1##*/}!"
83 die "Could not get VERSION for ${1##*/}!"
84 fi
85
86 # Go through the patches in reverse order (large to small)
87 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | sort -r) ; do
88 if [[ -n ${x} && -f ${x} ]] ; then
89 local ltver=$(VER_to_int "${version}")
90 local ptver=$(VER_to_int "${x##*/}")
91
92 # If libtool version smaller than patch version, skip patch.
93 [[ ${ltver} -lt ${ptver} ]] && continue
94 # For --remove-internal-dep ...
95 if [[ -n $3 ]] ; then
96 # For replace @REM_INT_DEP@ with what was passed
97 # to --remove-internal-dep
98 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \
99 ${T}/$$.rem_int_deps.patch
100
101 x="${T}/$$.rem_int_deps.patch"
102 fi
103
104 if ELT_try_and_apply_patch "$1" "${x}" ; then
105 ret=0
106 break
107 fi
108 fi
109 done
110 fi
111
112 return ${ret}
113}
13 114
14elibtoolize() { 115elibtoolize() {
15
16 local x="" 116 local x=
17 local y="" 117 local y=
18 local dopatch="no"
19 local dotest="yes"
20 local dorelink="yes"
21 local dotmp="yes"
22 local doportage="yes"
23 local portage="no" 118 local do_portage="no"
119 local do_reversedeps="no"
120 local do_only_patches="no"
121 local deptoremove=
24 local mylist="" 122 local my_dirlist=
123 local elt_patches="portage relink max_cmd_len sed test tmp"
124 local start_dir="${PWD}"
25 125
26 mylist="$(find_ltmain)" 126 my_dirlist="$(ELT_find_ltmain_sh)"
27 # Only apply portage patch, and dont "libtoolize --copy --force" 127
28 # if all patches fail. 128 for x in "$@" ; do
29 for x in ${*} 129 case "${x}" in
30 do 130 "--portage")
31 if [ "${x}" = "--portage" ] 131 # Only apply portage patch, and don't
32 then 132 # 'libtoolize --copy --force' if all patches fail.
33 portage="yes" 133 do_portage="yes"
34 fi 134 ;;
135 "--reverse-deps")
136 # Apply the reverse-deps patch
137 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
138 do_reversedeps="yes"
139 elt_patches="${elt_patches} fix-relink"
140 ;;
141 "--patch-only")
142 # Do not run libtoolize if none of the patches apply ..
143 do_only_patches="yes"
144 ;;
145 "^--remove-internal-dep="*)
146 # We will replace @REM_INT_DEP@ with what is needed
147 # in ELT_walk_patches() ...
148 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')"
149
150 # Add the patch for this ...
151 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep"
152 ;;
153 "--shallow")
35 # Only patch the ltmain.sh in ${S} 154 # Only patch the ltmain.sh in ${S}
36 if [ "${x}" = "--shallow" ]
37 then
38 if [ -f ${S}/ltmain.sh ] 155 if [ -f "${S}/ltmain.sh" ]
39 then 156 then
40 mylist="${S}" 157 my_dirlist="${S}"
41 else 158 else
42 mylist="" 159 my_dirlist=
43 fi 160 fi
44 else 161 ;;
45 mylist="$(find_ltmain)" 162 "--no-uclibc")
46 fi 163 NO_UCLIBCTOOLIZE=1
164 ;;
165 *)
166 eerror "Invalid elibtoolize option: $x"
167 die "elibtoolize called with $x ??"
168 esac
47 done 169 done
48 170
171 if use ppc-macos ; then
172 glibtoolize --copy --force
173 darwintoolize
174 fi
175
49 for x in ${mylist} 176 for x in ${my_dirlist} ; do
50 do 177 local tmp=$(echo "${x}" | sed -e "s|${S}||")
178 export ELT_APPLIED_PATCHES=
179
51 cd ${x} 180 cd ${x}
52 einfo "Working directory: ${x}..." 181 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g') ..."
53 dopatch="yes"
54 dotest="yes"
55 dorelink="yes"
56 dotmp="yes"
57 doportage="yes"
58 182
59 for y in test_patch relink_patch tmp_patch portage_patch 183 for y in ${elt_patches} ; do
60 do 184 local ret=0
61 if ! eval ${y} --test $>${T}/libtool.foo 185
62 then 186 case "${y}" in
187 "rem-int-dep")
188 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
189 ret=$?
190 ;;
191 "fix-relink")
192 # Do not apply if we do not have the relink patch applied ...
193 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
194 ELT_walk_patches "${x}/ltmain.sh" "${y}"
195 ret=$?
196 fi
197 ;;
198 "max_cmd_len")
199 # Do not apply if $max_cmd_len is not used ...
200 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
201 ELT_walk_patches "${x}/ltmain.sh" "${y}"
202 ret=$?
203 fi
204 ;;
205 *)
206 ELT_walk_patches "${x}/ltmain.sh" "${y}"
207 ret=$?
208 ;;
209 esac
210
211 if [[ ${ret} -ne 0 ]] ; then
63 case ${y} in 212 case ${y} in
64 test_patch) 213 "relink")
65 # non critical patch 214 # Critical patch, but could be applied ...
66 dotest="no" 215 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
216 ewarn " Could not apply relink.patch!"
217 fi
67 ;; 218 ;;
68 relink_patch) 219 "portage")
69 # critical patch, but could be applied 220 # Critical patch - for this one we abort, as it can really
70 if [ -z "$(grep -e "inst_prefix_dir" ltmain.sh)" ] && \ 221 # cause breakage without it applied!
71 [ "${portage}" = "no" ] 222 if [[ ${do_portage} == "yes" ]] ; then
72 then 223 # Stupid test to see if its already applied ...
73 dopatch="no" 224 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
225 echo
226 eerror "Portage patch requested, but failed to apply!"
227 die "Portage patch requested, but failed to apply!"
228 fi
229 else
230 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
231 ewarn " Portage patch seems to be already applied."
232 ewarn " Please verify that it is not needed."
233 else
234 local version=$( \
235 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
236 echo "${VERSION}")
237
238 echo
239 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
240 die "Portage patch failed to apply!"
241 fi
242 # We do not want to run libtoolize ...
243 ELT_APPLIED_PATCHES="portage"
74 fi 244 fi
75 dorelink="no"
76 ;;
77 tmp_patch)
78 # non critical patch
79 dotmp="no"
80 ;;
81 portage_patch)
82 # critical patch
83 if [ "${portage}" = "yes" ]
84 then
85 echo
86 eerror "Portage patch requested, but failed to apply!"
87 die
88 fi
89 dopatch="no"
90 doportage="no"
91 ;; 245 ;;
92 esac 246 esac
93 fi 247 fi
94 done
95 248
96 for y in test_patch relink_patch tmp_patch portage_patch 249 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
97 do 250 if [[ ${do_portage} == "no" && \
98 if [ "${dopatch}" = "yes" ] 251 ${do_reversedeps} == "no" && \
252 ${do_only_patches} == "no" && \
253 ${deptoremove} == "" ]]
99 then 254 then
100 case ${y} in 255 ewarn "Cannot apply any patches, please file a bug about this"
101 test_patch) 256 break
102 if [ "${dotest}" = "no" ] 257
103 then 258 # Sometimes ltmain.sh is in a subdirectory ...
104 continue 259 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
260 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
261 cd "${x}"/../
105 fi 262 fi
106 ;;
107 relink_patch)
108 if [ "${dorelink}" = "no" ]
109 then
110 continue
111 fi 263 fi
112 ;; 264
113 tmp_patch) 265 if type -p libtoolize &> /dev/null ; then
114 if [ "${dotmp}" = "no" ] 266 ewarn "Cannot apply any patches, running libtoolize..."
115 then
116 continue
117 fi
118 ;;
119 portage_patch)
120 if [ "${doportage}" = "no" ]
121 then
122 continue
123 fi
124 ;;
125 esac
126
127 einfo "Applying libtool-${y/_patch/}.patch..."
128 eval ${y} $>${T}/libtool.foo
129 elif [ "${portage}" = "no" ]
130 then
131 libtoolize --copy --force 267 libtoolize --copy --force
268 fi
269 cd "${x}"
132 break 270 break
271 fi
133 fi 272 fi
134 done 273 done
135 done 274 done
136 275
137 if [ -f libtool ] 276 if [[ -f libtool ]] ; then
138 then
139 rm -f libtool 277 rm -f libtool
140 fi 278 fi
141 279
142 # We need to change the pwd back to $S, as we may be called in 280 cd "${start_dir}"
143 # src_compile()
144 cd ${S}
145}
146 281
147# 282 uclibctoolize
148# Returns all the directories containing ltmain.sh 283}
149# 284
150find_ltmain() { 285uclibctoolize() {
151 286 [[ -n ${NO_UCLIBCTOOLIZE} ]] && return 0
287
288 local errmsg=""
289 [[ ${CTARGET:-${CHOST}} == *-uclibc ]] \
290 && errmsg="PLEASE CHECK" \
291 || errmsg="Already patched"
292 local targets=""
152 local x="" 293 local x
153 local dirlist=""
154 294
155 for x in $(find ${S} -name 'ltmain.sh') 295 if [[ -z $* ]] ; then
156 do 296 targets=$(find ${S} -name configure -o -name ltconfig)
157 dirlist="${dirlist} ${x%/*}" 297 fi
298
299 einfo "Applying uClibc/libtool patches ..."
300 for x in ${targets} ; do
301 [[ ! -s ${x} ]] && continue
302 case ${x##*/} in
303 configure)
304 if grep 'Transform linux' "${x}" > /dev/null ; then
305 ebegin " Fixing \${S}${x/${S}}"
306 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null
307 eend $? "${errmsg} ${x}"
308 fi
309 ;;
310
311 ltconfig)
312 local ver=$(grep '^VERSION=' ${x})
313 ver=${ver/VERSION=}
314 [[ ${ver:0:3} == "1.4" ]] && ver="1.3" # 1.4 and 1.3 are compat
315 ebegin " Fixing \${S}${x/${S}}"
316 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null
317 eend $? "${errmsg} ${x}"
318 ;;
319 esac
158 done 320 done
159
160 echo "${dirlist}"
161} 321}
162 322
163# 323darwintoolize() {
164# Various patches we want to apply.
165#
166# Contains: portage_patch
167# relink_patch
168# test_patch
169#
170portage_patch() {
171
172 local opts="" 324 local targets=""
325 local x
173 326
174 if [ "${1}" = "--test" ] 327 if [[ -z $* ]] ; then
175 then 328 targets=$(find ${S} -name ltmain.sh -o -name ltconfig)
176 opts="--force --dry-run"
177 fi 329 fi
178 330
179 patch ${opts} -p0 <<-"ENDPATCH" 331 einfo "Applying Darwin/libtool patches ..."
180 --- ltmain.sh.orig Wed Apr 3 01:19:37 2002 332 for x in ${targets} ; do
181 +++ ltmain.sh Sun May 26 19:50:52 2002 333 [[ ! -s ${x} ]] && continue
182 @@ -3940,9 +3940,40 @@ 334 case ${x##*/} in
183 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 335 ltmain.sh|ltconfig)
184 exit 1 336 local ver=$(grep '^VERSION=' ${x})
185 fi 337 ver=${ver/VERSION=}
186 - newdependency_libs="$newdependency_libs $libdir/$name" 338 if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then
187 + # We do not want portage's install root ($D) present. Check only for 339 ver="1.3" # 1.4, 1.5 and 1.3 are compat
188 + # this if the .la is being installed.
189 + if test "$installed" = yes && test "$D"; then
190 + mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`"
191 + else
192 + mynewdependency_lib="$libdir/$name"
193 + fi
194 + # Do not add duplicates
195 + if test "$mynewdependency_lib"; then
196 + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
197 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
198 + fi
199 + fi
200 + ;;
201 + *)
202 + if test "$installed" = yes && test "$S"; then
203 + # We do not want portage's build root ($S) present.
204 + if test -n "`echo $deplib |grep -e "$S"`"
205 + then
206 + newdependency_libs=""
207 + # We do not want portage's install root ($D) present.
208 + elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
209 + mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
210 + fi
211 + else
212 + mynewdependency_lib="$deplib"
213 + fi
214 + # Do not add duplicates
215 + if test "$mynewdependency_lib"; then
216 + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
217 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
218 + fi
219 + fi
220 ;;
221 - *) newdependency_libs="$newdependency_libs $deplib" ;;
222 esac
223 done
224 dependency_libs="$newdependency_libs"
225 @@ -3975,6 +4005,10 @@
226 case $host,$output,$installed,$module,$dlname in
227 *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
228 esac
229 + # Do not add duplicates
230 + if test "$installed" = yes && test "$D"; then
231 + install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
232 + fi
233 $echo > $output "\
234 # $outputname - a libtool library file
235 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
236 ENDPATCH
237}
238
239relink_patch() {
240
241 local opts=""
242 local retval=0
243
244 if [ "${1}" = "--test" ]
245 then
246 opts="--force --dry-run"
247 fi
248
249 patch ${opts} -p0 <<-"ENDPATCH"
250 --- ltmain.sh Sun Aug 12 18:08:05 2001
251 +++ ltmain-relinkable.sh Tue Aug 28 18:55:13 2001
252 @@ -827,6 +827,7 @@
253 linker_flags=
254 dllsearchpath=
255 lib_search_path=`pwd`
256 + inst_prefix_dir=
257
258 avoid_version=no
259 dlfiles=
260 @@ -959,6 +960,11 @@
261 prev=
262 continue
263 ;;
264 + inst_prefix)
265 + inst_prefix_dir="$arg"
266 + prev=
267 + continue
268 + ;;
269 release)
270 release="-$arg"
271 prev=
272 @@ -1167,6 +1173,11 @@
273 continue
274 ;;
275
276 + -inst-prefix-dir)
277 + prev=inst_prefix
278 + continue
279 + ;;
280 +
281 # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
282 # so, if we see these flags be careful not to treat them like -L
283 -L[A-Z][A-Z]*:*)
284 @@ -2231,7 +2242,16 @@
285 if test "$hardcode_direct" = yes; then
286 add="$libdir/$linklib"
287 elif test "$hardcode_minus_L" = yes; then
288 - add_dir="-L$libdir"
289 + # Try looking first in the location we're being installed to.
290 + add_dir=
291 + if test -n "$inst_prefix_dir"; then
292 + case "$libdir" in
293 + [\\/]*)
294 + add_dir="-L$inst_prefix_dir$libdir"
295 + ;;
296 + esac
297 + fi
298 + add_dir="$add_dir -L$libdir"
299 add="-l$name"
300 elif test "$hardcode_shlibpath_var" = yes; then
301 case :$finalize_shlibpath: in
302 @@ -2241,7 +2261,16 @@
303 add="-l$name"
304 else
305 # We cannot seem to hardcode it, guess we'll fake it.
306 - add_dir="-L$libdir"
307 + # Try looking first in the location we're being installed to.
308 + add_dir=
309 + if test -n "$inst_prefix_dir"; then
310 + case "$libdir" in
311 + [\\/]*)
312 + add_dir="-L$inst_prefix_dir$libdir"
313 + ;;
314 + esac
315 + fi
316 + add_dir="$add_dir -L$libdir"
317 add="-l$name"
318 fi
319
320 @@ -4622,12 +4651,30 @@
321 dir="$dir$objdir"
322
323 if test -n "$relink_command"; then
324 + # Determine the prefix the user has applied to our future dir.
325 + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
326 +
327 + # Don't allow the user to place us outside of our expected
328 + # location b/c this prevents finding dependent libraries that
329 + # are installed to the same prefix.
330 + if test "$inst_prefix_dir" = "$destdir"; then
331 + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
332 + exit 1
333 + fi
334 +
335 + if test -n "$inst_prefix_dir"; then
336 + # Stick the inst_prefix_dir data into the link command.
337 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
338 + else
339 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
340 + fi
341 +
342 $echo "$modename: warning: relinking \`$file'" 1>&2
343 $show "$relink_command"
344 if $run eval "$relink_command"; then :
345 else
346 $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
347 - continue
348 + exit 1
349 fi
350 fi 340 fi
351
352 ENDPATCH
353 341
354 retval=$? 342 ebegin " Fixing \${S}${x/${S}}"
355 343 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null
356 # This one dont apply clean to libtool-1.4.2a, so do it manually. 344 eend $? "PLEASE CHECK ${x}"
357 if [ "${1}" != "--test" ] && [ "${retval}" -eq 0 ]
358 then
359 cp ltmain.sh ltmain.sh.orig
360 sed -e 's:cd `pwd`; $SHELL $0 --mode=relink $libtool_args:cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@:' \
361 ltmain.sh.orig > ltmain.sh
362 rm -f ltmain.sh.orig
363 fi
364
365 return ${retval}
366}
367
368tmp_patch() {
369
370 local opts=""
371
372 if [ "${1}" = "--test" ]
373 then
374 opts="--force --dry-run"
375 fi
376
377 patch ${opts} -p0 <<-"ENDPATCH"
378 --- ltmain.sh Sun Aug 12 18:08:05 2001
379 +++ ltmain-relinkable.sh Tue Aug 28 18:55:13 2001
380 @@ -4782,7 +4829,11 @@
381 if test "$finalize" = yes && test -z "$run"; then
382 tmpdir="/tmp"
383 test -n "$TMPDIR" && tmpdir="$TMPDIR"
384 - tmpdir="$tmpdir/libtool-$$"
385 + tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
386 + if test $? = 0 ; then :
387 + else
388 + tmpdir="$tmpdir/libtool-$$"
389 + fi
390 if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
391 else
392 $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
393 ENDPATCH
394}
395
396test_patch() {
397
398 local opts=""
399
400 if [ "${1}" = "--test" ]
401 then
402 opts="--force --dry-run"
403 fi
404
405 patch ${opts} -p0 <<-"ENDPATCH"
406 --- ./ltmain.sh Tue May 29 19:16:03 2001
407 +++ ./ltmain.sh Tue May 29 21:26:50 2001
408 @@ -459,7 +459,7 @@
409 pic_mode=default
410 ;;
411 esac
412 - if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
413 + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
414 # non-PIC code in shared libraries is not supported
415 pic_mode=default
416 fi
417 @@ -1343,7 +1343,7 @@
418 ;; 345 ;;
419 esac 346 esac
420 for pass in $passes; do
421 - if test $linkmode = prog; then
422 + if test "$linkmode" = prog; then
423 # Determine which files to process
424 case $pass in
425 dlopen)
426 @@ -1360,11 +1360,11 @@
427 found=no
428 case $deplib in
429 -l*)
430 - if test $linkmode = oldlib && test $linkmode = obj; then
431 + if test "$linkmode" = oldlib && test "$linkmode" = obj; then
432 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
433 continue
434 fi
435 - if test $pass = conv; then
436 + if test "$pass" = conv; then
437 deplibs="$deplib $deplibs"
438 continue
439 fi
440 @@ -1384,7 +1384,7 @@
441 finalize_deplibs="$deplib $finalize_deplibs"
442 else
443 deplibs="$deplib $deplibs"
444 - test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
445 + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
446 fi
447 continue
448 fi
449 @@ -1393,16 +1393,16 @@
450 case $linkmode in
451 lib)
452 deplibs="$deplib $deplibs"
453 - test $pass = conv && continue
454 + test "$pass" = conv && continue
455 newdependency_libs="$deplib $newdependency_libs"
456 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
457 ;;
458 prog)
459 - if test $pass = conv; then
460 + if test "$pass" = conv; then
461 deplibs="$deplib $deplibs"
462 continue
463 fi
464 - if test $pass = scan; then
465 + if test "$pass" = scan; then
466 deplibs="$deplib $deplibs"
467 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
468 else
469 @@ -1417,7 +1417,7 @@
470 continue
471 ;; # -L
472 -R*)
473 - if test $pass = link; then
474 + if test "$pass" = link; then
475 dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
476 # Make sure the xrpath contains only unique directories.
477 case "$xrpath " in
478 @@ -1430,7 +1430,7 @@
479 ;;
480 *.la) lib="$deplib" ;;
481 *.$libext)
482 - if test $pass = conv; then
483 + if test "$pass" = conv; then
484 deplibs="$deplib $deplibs"
485 continue
486 fi
487 @@ -1451,7 +1451,7 @@
488 continue
489 ;;
490 prog)
491 - if test $pass != link; then
492 + if test "$pass" != link; then
493 deplibs="$deplib $deplibs"
494 else
495 compile_deplibs="$deplib $compile_deplibs"
496 @@ -1462,7 +1462,7 @@
497 esac # linkmode
498 ;; # *.$libext
499 *.lo | *.$objext)
500 - if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
501 + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
502 # If there is no dlopen support or we're linking statically,
503 # we need to preload.
504 newdlprefiles="$newdlprefiles $deplib"
505 @@ -1512,13 +1512,13 @@
506
507 if test "$linkmode,$pass" = "lib,link" ||
508 test "$linkmode,$pass" = "prog,scan" ||
509 - { test $linkmode = oldlib && test $linkmode = obj; }; then
510 + { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
511 # Add dl[pre]opened files of deplib
512 test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
513 test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
514 fi
515
516 - if test $pass = conv; then
517 + if test "$pass" = conv; then
518 # Only check for convenience libraries
519 deplibs="$lib $deplibs"
520 if test -z "$libdir"; then
521 @@ -1537,7 +1537,7 @@
522 esac
523 tmp_libs="$tmp_libs $deplib"
524 done
525 - elif test $linkmode != prog && test $linkmode != lib; then
526 + elif test "$linkmode" != prog && test "$linkmode" != lib; then
527 $echo "$modename: \`$lib' is not a convenience library" 1>&2
528 exit 1
529 fi
530 @@ -1555,7 +1555,7 @@
531 fi
532
533 # This library was specified with -dlopen.
534 - if test $pass = dlopen; then
535 + if test "$pass" = dlopen; then
536 if test -z "$libdir"; then
537 $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
538 exit 1
539 @@ -1604,7 +1604,7 @@
540 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
541
542 # This library was specified with -dlpreopen.
543 - if test $pass = dlpreopen; then
544 + if test "$pass" = dlpreopen; then
545 if test -z "$libdir"; then
546 $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
547 exit 1
548 @@ -1623,7 +1623,7 @@
549
550 if test -z "$libdir"; then
551 # Link the convenience library
552 - if test $linkmode = lib; then
553 + if test "$linkmode" = lib; then
554 deplibs="$dir/$old_library $deplibs"
555 elif test "$linkmode,$pass" = "prog,link"; then
556 compile_deplibs="$dir/$old_library $compile_deplibs"
557 @@ -1634,7 +1634,7 @@
558 continue
559 fi
560
561 - if test $linkmode = prog && test $pass != link; then
562 + if test "$linkmode" = prog && test "$pass" != link; then
563 newlib_search_path="$newlib_search_path $ladir"
564 deplibs="$lib $deplibs"
565
566 @@ -1671,7 +1671,7 @@
567 # Link against this shared library
568
569 if test "$linkmode,$pass" = "prog,link" ||
570 - { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
571 + { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
572 # Hardcode the library path.
573 # Skip directories that are in the system default run-time
574 # search path.
575 @@ -1693,7 +1693,7 @@
576 esac
577 ;;
578 esac
579 - if test $linkmode = prog; then
580 + if test "$linkmode" = prog; then
581 # We need to hardcode the library path
582 if test -n "$shlibpath_var"; then
583 # Make sure the rpath contains only unique directories.
584 @@ -1777,7 +1777,7 @@
585 linklib=$newlib
586 fi # test -n $old_archive_from_expsyms_cmds
587
588 - if test $linkmode = prog || test "$mode" != relink; then
589 + if test "$linkmode" = prog || test "$mode" != relink; then
590 add_shlibpath=
591 add_dir=
592 add=
593 @@ -1826,7 +1826,7 @@
594 *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
595 esac
596 fi
597 - if test $linkmode = prog; then
598 + if test "$linkmode" = prog; then
599 test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
600 test -n "$add" && compile_deplibs="$add $compile_deplibs"
601 else
602 @@ -1843,7 +1843,7 @@
603 fi
604 fi
605
606 - if test $linkmode = prog || test "$mode" = relink; then
607 + if test "$linkmode" = prog || test "$mode" = relink; then
608 add_shlibpath=
609 add_dir=
610 add=
611 @@ -1865,7 +1865,7 @@
612 add="-l$name"
613 fi
614
615 - if test $linkmode = prog; then
616 + if test "$linkmode" = prog; then
617 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
618 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
619 else
620 @@ -1873,7 +1873,7 @@
621 test -n "$add" && deplibs="$add $deplibs"
622 fi
623 fi
624 - elif test $linkmode = prog; then
625 + elif test "$linkmode" = prog; then
626 if test "$alldeplibs" = yes &&
627 { test "$deplibs_check_method" = pass_all ||
628 { test "$build_libtool_libs" = yes &&
629 @@ -1932,9 +1932,9 @@
630 fi
631 fi # link shared/static library?
632
633 - if test $linkmode = lib; then
634 + if test "$linkmode" = lib; then
635 if test -n "$dependency_libs" &&
636 - { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
637 + { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
638 test $link_static = yes; }; then
639 # Extract -R from dependency_libs
640 temp_deplibs=
641 @@ -1964,7 +1964,7 @@
642 tmp_libs="$tmp_libs $deplib"
643 done
644
645 - if test $link_all_deplibs != no; then
646 + if test "$link_all_deplibs" != no; then
647 # Add the search paths of all dependency libraries
648 for deplib in $dependency_libs; do
649 case $deplib in
650 @@ -2007,15 +2007,15 @@
651 fi # link_all_deplibs != no
652 fi # linkmode = lib
653 done # for deplib in $libs
654 - if test $pass = dlpreopen; then
655 + if test "$pass" = dlpreopen; then
656 # Link the dlpreopened libraries before other libraries
657 for deplib in $save_deplibs; do
658 deplibs="$deplib $deplibs"
659 done 347 done
660 fi
661 - if test $pass != dlopen; then
662 - test $pass != scan && dependency_libs="$newdependency_libs"
663 - if test $pass != conv; then
664 + if test "$pass" != dlopen; then
665 + test "$pass" != scan && dependency_libs="$newdependency_libs"
666 + if test "$pass" != conv; then
667 # Make sure lib_search_path contains only unique directories.
668 lib_search_path=
669 for dir in $newlib_search_path; do
670 @@ -2073,7 +2073,7 @@
671 deplibs=
672 fi
673 done # for pass
674 - if test $linkmode = prog; then
675 + if test "$linkmode" = prog; then
676 dlfiles="$newdlfiles"
677 dlprefiles="$newdlprefiles"
678 fi
679 @@ -2410,7 +2410,7 @@
680 ;;
681 *)
682 # Add libc to deplibs on all other systems if necessary.
683 - if test $build_libtool_need_lc = "yes"; then
684 + if test "$build_libtool_need_lc" = "yes"; then
685 deplibs="$deplibs -lc"
686 fi
687 ;;
688 @@ -2683,7 +2683,7 @@
689
690 # Test again, we may have decided not to build it any more
691 if test "$build_libtool_libs" = yes; then
692 - if test $hardcode_into_libs = yes; then
693 + if test "$hardcode_into_libs" = yes; then
694 # Hardcode the library paths
695 hardcode_libdirs=
696 dep_rpath=
697 ENDPATCH
698} 348}
699 349
350# char *VER_major(string)
351#
352# Return the Major (X of X.Y.Z) version
353#
354VER_major() {
355 [[ -z $1 ]] && return 1
356
357 local VER=$@
358 echo ${VER%%[^[:digit:]]*}
359}
360
361# char *VER_minor(string)
362#
363# Return the Minor (Y of X.Y.Z) version
364#
365VER_minor() {
366 [[ -z $1 ]] && return 1
367
368 local VER=$@
369 VER=${VER#*.}
370 echo ${VER%%[^[:digit:]]*}
371}
372
373# char *VER_micro(string)
374#
375# Return the Micro (Z of X.Y.Z) version.
376#
377VER_micro() {
378 [[ -z $1 ]] && return 1
379
380 local VER=$@
381 VER=${VER#*.*.}
382 echo ${VER%%[^[:digit:]]*}
383}
384
385# int VER_to_int(string)
386#
387# Convert a string type version (2.4.0) to an int (132096)
388# for easy compairing or versions ...
389#
390VER_to_int() {
391 [[ -z $1 ]] && return 1
392
393 local VER_MAJOR=$(VER_major "$1")
394 local VER_MINOR=$(VER_minor "$1")
395 local VER_MICRO=$(VER_micro "$1")
396 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
397
398 # We make version 1.0.0 the minimum version we will handle as
399 # a sanity check ... if its less, we fail ...
400 if [[ ${VER_int} -ge 65536 ]] ; then
401 echo "${VER_int}"
402 return 0
403 fi
404
405 echo 1
406 return 1
407}

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.47

  ViewVC Help
Powered by ViewVC 1.1.20