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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.83

  ViewVC Help
Powered by ViewVC 1.1.20