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

Diff of /eclass/libtool.eclass

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

Revision 1.24 Revision 1.62
1# Copyright 1999-2004 Gentoo Technologies, Inc. 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.24 2004/01/02 21:54:28 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.62 2005/12/07 22:50:05 azarah Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass patches ltmain.sh distributed with libtoolized packages with the 7# This eclass patches ltmain.sh distributed with libtoolized packages with the
8# relink and portage patch among others 8# relink and portage patch among others
9 9
10ECLASS="libtool"
11INHERITED="${INHERITED} ${ECLASS}"
12 10
13newdepend "!bootstrap? ( 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.
14 18
15DESCRIPTION="Based on the ${ECLASS} eclass" 19DESCRIPTION="Based on the ${ECLASS} eclass"
16 20
17ELIBTOOL_VERSION="2.0.1" 21ELIBTOOL_VERSION="2.0.2"
18
19 22
20ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" 23ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches"
21ELT_APPLIED_PATCHES= 24ELT_APPLIED_PATCHES=
25ELT_LTMAIN_SH=
22 26
23# 27#
24# Returns all the directories containing ltmain.sh 28# Returns all the directories containing ltmain.sh
25# 29#
26ELT_find_ltmain_sh() { 30ELT_find_ltmain_sh() {
27 local x= 31 local x=
28 local dirlist= 32 local dirlist=
29 33
30 for x in $(find "${S}" -name 'ltmain.sh') 34 for x in $(find "${S}" -name 'ltmain.sh') ; do
31 do
32 dirlist="${dirlist} ${x%/*}" 35 dirlist="${dirlist} ${x%/*}"
33 done 36 done
34 37
35 echo "${dirlist}" 38 echo "${dirlist}"
36} 39}
37 40
38# 41#
39# See if we can apply $2 on $1, and if so, do it 42# See if we can apply $2 on $1, and if so, do it
40# 43#
41ELT_try_and_apply_patch() { 44ELT_try_and_apply_patch() {
42 local ret=0 45 local ret=0
46 local file=$1
43 local patch="$2" 47 local patch=$2
44 48
45 # We only support patchlevel of 0 - why worry if its static patches? 49 # We only support patchlevel of 0 - why worry if its static patches?
46 if patch -p0 --dry-run $1 < ${patch} &>${T}/elibtool.log 50 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
47 then
48 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch..." 51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
49 patch -p0 $1 < ${patch} &>${T}/elibtool.log 52 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
53 &> "${T}/elibtool.log"
50 ret=$? 54 ret=$?
51 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 55 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
52 else 56 else
53 ret=1 57 ret=1
54 fi 58 fi
55 59
56 return ${ret} 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}"
57} 75}
58 76
59# 77#
60# Run through the patches in $2 and see if any 78# Run through the patches in $2 and see if any
61# apply to $1 ... 79# apply to $1 ...
62# 80#
63ELT_walk_patches() { 81ELT_walk_patches() {
64 local x= 82 local x=
65 local y= 83 local y=
66 local ret=1 84 local ret=1
85 local file=$1
86 local patch_set=$2
67 local patch_dir= 87 local patch_dir=
88 local rem_int_dep=$3
89 local version=
90 local ltmain_sh=$1
68 91
69 if [ -n "$2" ] 92 [[ ${file} == *"/configure" ]] && ltmain_sh=${ELT_LTMAIN_SH}
70 then 93 version=$(ELT_libtool_version "${ltmain_sh}")
71 if [ -d "${ELT_PATCH_DIR}/$2" ] 94
72 then 95 if [[ -n ${patch_set} ]] ; then
96 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
73 patch_dir="${ELT_PATCH_DIR}/$2" 97 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
74 else 98 else
75 return ${ret} 99 return "${ret}"
76 fi 100 fi
77 101
102 if [[ ${version} == "0" ]] ; then
103 eerror "Could not get VERSION for ${file##*/}!"
104 die "Could not get VERSION for ${file##*/}!"
105 fi
106
107 # Go through the patches in reverse order (large to small)
78 for x in $(ls -d "${patch_dir}"/* 2>/dev/null) 108 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
79 do 109 if [[ -n ${x} && -f ${x} ]] ; then
80 if [ -n "${x}" -a -f "${x}" ] 110 local ltver=$(VER_to_int "${version}")
81 then 111 local ptver=$(VER_to_int "${x##*/}")
112
113 # If libtool version smaller than patch version, skip patch.
114 [[ ${ltver} -lt ${ptver} ]] && continue
82 # For --remove-internal-dep ... 115 # For --remove-internal-dep ...
83 if [ -n "$3" ] 116 if [[ -n ${rem_int_dep} ]] ; then
84 then
85 # For replace @REM_INT_DEP@ with what was passed 117 # For replace @REM_INT_DEP@ with what was passed
86 # to --remove-internal-dep 118 # to --remove-internal-dep
87 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ 119 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
88 ${T}/$$.rem_int_deps.patch 120 "${T}/$$.rem_int_deps.patch"
89 121
90 x="${T}/$$.rem_int_deps.patch" 122 x="${T}/$$.rem_int_deps.patch"
91 fi 123 fi
92 124
93 if ELT_try_and_apply_patch "$1" "${x}" 125 if ELT_try_and_apply_patch "${file}" "${x}" ; then
94 then
95 ret=0 126 ret=0
96 break 127 break
97 fi 128 fi
98 fi 129 fi
99 done 130 done
100 fi 131 fi
101 132
102 return ${ret} 133 return "${ret}"
103} 134}
104 135
105elibtoolize() { 136elibtoolize() {
106 local x= 137 local x=
107 local y= 138 local y=
108 local do_portage="no" 139 local do_portage="no"
109 local do_reversedeps="no" 140 local do_reversedeps="no"
110 local do_only_patches="no" 141 local do_only_patches="no"
142 local do_uclibc="yes"
111 local deptoremove= 143 local deptoremove=
112 local my_dirlist= 144 local my_dirlist=
113 local elt_patches="portage relink sed test tmp" 145 local elt_patches="portage relink max_cmd_len sed test tmp"
146 local start_dir=${PWD}
114 147
115 my_dirlist="$(ELT_find_ltmain_sh)" 148 my_dirlist=$(ELT_find_ltmain_sh)
116 149
117 for x in $* 150 for x in "$@" ; do
118 do
119 case "${x}" in 151 case "${x}" in
120 "--portage") 152 "--portage")
121 # Only apply portage patch, and don't 153 # Only apply portage patch, and don't
122 # 'libtoolize --copy --force' if all patches fail. 154 # 'libtoolize --copy --force' if all patches fail.
123 do_portage="yes" 155 do_portage="yes"
133 do_only_patches="yes" 165 do_only_patches="yes"
134 ;; 166 ;;
135 "^--remove-internal-dep="*) 167 "^--remove-internal-dep="*)
136 # We will replace @REM_INT_DEP@ with what is needed 168 # We will replace @REM_INT_DEP@ with what is needed
137 # in ELT_walk_patches() ... 169 # in ELT_walk_patches() ...
138 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" 170 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
139 171
140 # Add the patch for this ... 172 # Add the patch for this ...
141 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" 173 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
142 ;; 174 ;;
143 "--shallow") 175 "--shallow")
144 # Only patch the ltmain.sh in ${S} 176 # Only patch the ltmain.sh in ${S}
145 if [ -f "${S}/ltmain.sh" ] 177 if [[ -f ${S}/ltmain.sh ]] ; then
146 then
147 my_dirlist="${S}" 178 my_dirlist=${S}
148 else 179 else
149 my_dirlist= 180 my_dirlist=
150 fi 181 fi
151 ;; 182 ;;
183 "--no-uclibc")
184 do_uclibc="no"
185 ;;
186 *)
187 eerror "Invalid elibtoolize option: ${x}"
188 die "elibtoolize called with ${x} ??"
152 esac 189 esac
153 done 190 done
154 191
192 [[ ${do_uclibc} == "yes" ]] && \
193 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
194
195 [[ ${CHOST} == *"-freebsd"* ]] && \
196 elt_patches="${elt_patches} fbsd-conf"
197
198 if useq ppc-macos ; then
199 local opts
200 [[ -f Makefile.am ]] && opts="--automake"
201 glibtoolize --copy --force ${opts}
202
203 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
204 fi
205
155 for x in ${my_dirlist} 206 for x in ${my_dirlist} ; do
156 do
157 local tmp="$(echo "${x}" | sed -e "s|${S}||")" 207 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
158 export ELT_APPLIED_PATCHES= 208 export ELT_APPLIED_PATCHES=
159 209 export ELT_LTMAIN_SH="${x}/ltmain.sh"
210
211 [[ -f ${x}/.elibtoolized ]] && continue
212
160 cd ${x} 213 cd ${x}
161 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g')..." 214 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
162 215
163 for y in ${elt_patches} 216 for y in ${elt_patches} ; do
164 do
165 local ret=0 217 local ret=0
166 218
167 case "${y}" in 219 case "${y}" in
168 "rem-int-dep") 220 "rem-int-dep")
169 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 221 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
170 ret=$? 222 ret=$?
171 ;; 223 ;;
172 "fix-relink") 224 "fix-relink")
173 # Do not apply if we do not have the relink patch applied ... 225 # Do not apply if we do not have the relink patch applied ...
174 if [ -n "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ] 226 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
175 then
176 ELT_walk_patches "${x}/ltmain.sh" "${y}" 227 ELT_walk_patches "${x}/ltmain.sh" "${y}"
228 ret=$?
229 fi
230 ;;
231 "max_cmd_len")
232 # Do not apply if $max_cmd_len is not used ...
233 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
234 ELT_walk_patches "${x}/ltmain.sh" "${y}"
235 ret=$?
236 fi
237 ;;
238 "uclibc-conf")
239 if [[ -e ${x}/configure && \
240 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
241 ELT_walk_patches "${x}/configure" "${y}"
242 ret=$?
243 # ltmain.sh and co might be in a subdirectory ...
244 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
245 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
246 ELT_walk_patches "${x}/../configure" "${y}"
247 ret=$?
248 fi
249 ;;
250 "uclibc-ltconf")
251 # Newer libtoolize clears ltconfig, as not used anymore
252 if [[ -s ${x}/ltconfig ]] ; then
253 ELT_walk_patches "${x}/ltconfig" "${y}"
254 ret=$?
255 fi
256 ;;
257 "fbsd-conf")
258 if [[ -e ${x}/configure && \
259 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
260 ELT_walk_patches "${x}/configure" "${y}"
261 ret=$?
262 # ltmain.sh and co might be in a subdirectory ...
263 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
264 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
265 ELT_walk_patches "${x}/../configure" "${y}"
266 ret=$?
267 fi
268 ;;
269 "darwin-ltconf")
270 # Newer libtoolize clears ltconfig, as not used anymore
271 if [[ -s ${x}/ltconfig ]] ; then
272 ELT_walk_patches "${x}/ltconfig" "${y}"
177 ret=$? 273 ret=$?
178 fi 274 fi
179 ;; 275 ;;
180 *) 276 *)
181 ELT_walk_patches "${x}/ltmain.sh" "${y}" 277 ELT_walk_patches "${x}/ltmain.sh" "${y}"
182 ret=$? 278 ret=$?
183 ;; 279 ;;
184 esac 280 esac
185 281
186 if [ "${ret}" -ne 0 ] 282 if [[ ${ret} -ne 0 ]] ; then
187 then
188 case ${y} in 283 case ${y} in
189 "relink") 284 "relink")
285 local version=$(ELT_libtool_version "${x}/ltmain.sh")
190 # Critical patch, but could be applied ... 286 # Critical patch, but could be applied ...
287 # FIXME: Still need a patch for ltmain.sh > 1.4.0
191 if [ -z "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ] 288 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
192 then 289 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
193 ewarn " Could not apply relink.patch!" 290 ewarn " Could not apply relink.patch!"
194 fi 291 fi
195 ;; 292 ;;
196 "portage") 293 "portage")
197 # Critical patch - for this one we abort, as it can really 294 # Critical patch - for this one we abort, as it can really
198 # cause breakage without it applied! 295 # cause breakage without it applied!
199 if [ "${do_portage}" = "yes" ] 296 if [[ ${do_portage} == "yes" ]] ; then
200 then
201 # Stupid test to see if its already applied ... 297 # Stupid test to see if its already applied ...
202 if [ -z "$(grep 'We do not want portage' "${x}/ltmain.sh")" ] 298 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
203 then
204 echo 299 echo
205 eerror "Portage patch requested, but failed to apply!" 300 eerror "Portage patch requested, but failed to apply!"
206 die "Portage patch requested, but failed to apply!" 301 die "Portage patch requested, but failed to apply!"
207 fi 302 fi
208 else 303 else
209 ewarn " Could not apply portage.patch!" 304 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
305 # ewarn " Portage patch seems to be already applied."
210 ewarn " Please verify that it is not needed." 306 # ewarn " Please verify that it is not needed."
307 :
308 else
309 local version=$( \
310 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
311 echo "${VERSION}")
312
313 echo
314 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
315 die "Portage patch failed to apply!"
316 fi
317 # We do not want to run libtoolize ...
318 ELT_APPLIED_PATCHES="portage"
211 fi 319 fi
320 ;;
321 "uclibc-"*)
322 [[ ${CHOST} == *"-uclibc" ]] && \
323 ewarn " uClibc patch set '${y}' failed to apply!"
324 ;;
325 "fbsd-"*)
326 if [[ ${CHOST} == *"-freebsd"* ]] ; then
327 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' "${x}/configure") ]]; then
328 eerror " FreeBSD patch set '${y}' failed to apply!"
329 die "FreeBSD patch set '${y}' failed to apply!"
330 fi
331 fi
332 ;;
333 "darwin-"*)
334 useq ppc-macos && \
335 ewarn " Darwin patch set '${y}' failed to apply!"
212 ;; 336 ;;
213 esac 337 esac
214 fi 338 fi
339 done
215 340
216 if [ -z "${ELT_APPLIED_PATCHES}" ] 341 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
342 if [[ ${do_portage} == "no" && \
343 ${do_reversedeps} == "no" && \
344 ${do_only_patches} == "no" && \
345 ${deptoremove} == "" ]]
217 then 346 then
218 if [ "${do_portage}" = "no" -a \ 347 ewarn "Cannot apply any patches, please file a bug about this"
219 "${do_reversedeps}" = "no" -a \ 348 break
220 "${do_only_patches}" = "no" -a \ 349
221 "${deptoremove}" = "" ]
222 then
223 # Sometimes ltmain.sh is in a subdirectory ... 350 # Sometimes ltmain.sh is in a subdirectory ...
224 if [ ! -f ${x}/configure.in -a ! -f ${x}/configure.ac ] 351 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
225 then
226 if [ -f ${x}/../configure.in -o -f ${x}/../configure.ac ] 352 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
227 then
228 cd ${x}/../ 353 cd "${x}"/../
229 fi 354 fi
230 fi
231
232 if which libtoolize &>/dev/null
233 then
234 ewarn "Cannot apply any patch, running libtoolize..."
235 libtoolize --copy --force
236 fi
237 cd ${x}
238 break
239 fi 355 fi
356
357 if type -p libtoolize &> /dev/null ; then
358 ewarn "Cannot apply any patches, running libtoolize..."
359 libtoolize --copy --force
360 fi
361 cd "${x}"
362 break
240 fi 363 fi
241 done 364 fi
365
366 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
367
368 touch "${x}/.elibtoolized"
242 done 369 done
243 370
244 if [ -f libtool ] 371 cd "${start_dir}"
245 then 372}
246 rm -f libtool 373
374uclibctoolize() {
375 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!"
376 elibtoolize
377}
378
379darwintoolize() {
380 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!"
381 elibtoolize
382}
383
384# char *VER_major(string)
385#
386# Return the Major (X of X.Y.Z) version
387#
388VER_major() {
389 [[ -z $1 ]] && return 1
390
391 local VER=$@
392 echo "${VER%%[^[:digit:]]*}"
393}
394
395# char *VER_minor(string)
396#
397# Return the Minor (Y of X.Y.Z) version
398#
399VER_minor() {
400 [[ -z $1 ]] && return 1
401
402 local VER=$@
403 VER=${VER#*.}
404 echo "${VER%%[^[:digit:]]*}"
405}
406
407# char *VER_micro(string)
408#
409# Return the Micro (Z of X.Y.Z) version.
410#
411VER_micro() {
412 [[ -z $1 ]] && return 1
413
414 local VER=$@
415 VER=${VER#*.*.}
416 echo "${VER%%[^[:digit:]]*}"
417}
418
419# int VER_to_int(string)
420#
421# Convert a string type version (2.4.0) to an int (132096)
422# for easy compairing or versions ...
423#
424VER_to_int() {
425 [[ -z $1 ]] && return 1
426
427 local VER_MAJOR=$(VER_major "$1")
428 local VER_MINOR=$(VER_minor "$1")
429 local VER_MICRO=$(VER_micro "$1")
430 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
431
432 # We make version 1.0.0 the minimum version we will handle as
433 # a sanity check ... if its less, we fail ...
434 if [[ ${VER_int} -ge 65536 ]] ; then
435 echo "${VER_int}"
436 return 0
247 fi 437 fi
248 438
249 # We need to change the pwd back to $S, as we may be called in 439 echo 1
250 # src_compile() 440 return 1
251 cd ${S}
252} 441}
253

Legend:
Removed from v.1.24  
changed lines
  Added in v.1.62

  ViewVC Help
Powered by ViewVC 1.1.20