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

Diff of /eclass/libtool.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20