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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.74

  ViewVC Help
Powered by ViewVC 1.1.20