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

Diff of /eclass/libtool.eclass

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

Revision 1.25 Revision 1.65
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.25 2004/02/11 19:33:14 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.65 2006/03/30 12:29:23 flameeyes 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 max_cmd_len 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
220 "portage")
221 # Stupid test to see if its already applied ...
222 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
223 ELT_walk_patches "${x}/ltmain.sh" "${y}"
224 ret=$?
225 fi
226 ;;
168 "rem-int-dep") 227 "rem-int-dep")
169 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 228 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
170 ret=$? 229 ret=$?
171 ;; 230 ;;
172 "fix-relink") 231 "fix-relink")
173 # Do not apply if we do not have the relink patch applied ... 232 # Do not apply if we do not have the relink patch applied ...
174 if [ -n "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ] 233 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
175 then
176 ELT_walk_patches "${x}/ltmain.sh" "${y}" 234 ELT_walk_patches "${x}/ltmain.sh" "${y}"
177 ret=$? 235 ret=$?
178 fi 236 fi
179 ;; 237 ;;
180 "max_cmd_len") 238 "max_cmd_len")
181 # Do not apply if $max_cmd_len is not used ... 239 # Do not apply if $max_cmd_len is not used ...
182 if [ -n "$(grep 'max_cmd_len' "${x}/ltmain.sh")" ] 240 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
183 then
184 ELT_walk_patches "${x}/ltmain.sh" "${y}" 241 ELT_walk_patches "${x}/ltmain.sh" "${y}"
242 ret=$?
243 fi
244 ;;
245 "uclibc-conf")
246 if [[ -e ${x}/configure && \
247 -n $(grep 'Transform linux' "${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 'Transform linux' "${x}/../configure") ]] ; then
253 ELT_walk_patches "${x}/../configure" "${y}"
254 ret=$?
255 fi
256 ;;
257 "uclibc-ltconf")
258 # Newer libtoolize clears ltconfig, as not used anymore
259 if [[ -s ${x}/ltconfig ]] ; then
260 ELT_walk_patches "${x}/ltconfig" "${y}"
261 ret=$?
262 fi
263 ;;
264 "fbsd-conf")
265 if [[ -e ${x}/configure && \
266 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
267 ELT_walk_patches "${x}/configure" "${y}"
268 ret=$?
269 # ltmain.sh and co might be in a subdirectory ...
270 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
271 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
272 ELT_walk_patches "${x}/../configure" "${y}"
273 ret=$?
274 fi
275 ;;
276 "darwin-ltconf")
277 # Newer libtoolize clears ltconfig, as not used anymore
278 if [[ -s ${x}/ltconfig ]] ; then
279 ELT_walk_patches "${x}/ltconfig" "${y}"
185 ret=$? 280 ret=$?
186 fi 281 fi
187 ;; 282 ;;
188 *) 283 *)
189 ELT_walk_patches "${x}/ltmain.sh" "${y}" 284 ELT_walk_patches "${x}/ltmain.sh" "${y}"
190 ret=$? 285 ret=$?
191 ;; 286 ;;
192 esac 287 esac
193 288
194 if [ "${ret}" -ne 0 ] 289 if [[ ${ret} -ne 0 ]] ; then
195 then
196 case ${y} in 290 case ${y} in
197 "relink") 291 "relink")
292 local version=$(ELT_libtool_version "${x}/ltmain.sh")
198 # Critical patch, but could be applied ... 293 # Critical patch, but could be applied ...
294 # FIXME: Still need a patch for ltmain.sh > 1.4.0
199 if [ -z "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ] 295 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
200 then 296 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
201 ewarn " Could not apply relink.patch!" 297 ewarn " Could not apply relink.patch!"
202 fi 298 fi
203 ;; 299 ;;
204 "portage") 300 "portage")
205 # Critical patch - for this one we abort, as it can really 301 # Critical patch - for this one we abort, as it can really
206 # cause breakage without it applied! 302 # cause breakage without it applied!
207 if [ "${do_portage}" = "yes" ] 303 if [[ ${do_portage} == "yes" ]] ; then
208 then
209 # Stupid test to see if its already applied ... 304 # Stupid test to see if its already applied ...
210 if [ -z "$(grep 'We do not want portage' "${x}/ltmain.sh")" ] 305 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
211 then
212 echo 306 echo
213 eerror "Portage patch requested, but failed to apply!" 307 eerror "Portage patch requested, but failed to apply!"
308 eerror "Please bug azarah or vapier to add proper patch."
214 die "Portage patch requested, but failed to apply!" 309 die "Portage patch requested, but failed to apply!"
215 fi 310 fi
216 else 311 else
217 ewarn " Could not apply portage.patch!" 312 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
313 # ewarn " Portage patch seems to be already applied."
218 ewarn " Please verify that it is not needed." 314 # ewarn " Please verify that it is not needed."
315 :
316 else
317 local version=$( \
318 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
319 echo "${VERSION}")
320
321 echo
322 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
323 eerror "Please bug azarah or vapier to add proper patch."
324 die "Portage patch failed to apply!"
325 fi
326 # We do not want to run libtoolize ...
327 ELT_APPLIED_PATCHES="portage"
219 fi 328 fi
329 ;;
330 "uclibc-"*)
331 [[ ${CHOST} == *"-uclibc" ]] && \
332 ewarn " uClibc patch set '${y}' failed to apply!"
333 ;;
334 "fbsd-"*)
335 if [[ ${CHOST} == *"-freebsd"* ]] ; then
336 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
337 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
338 eerror " FreeBSD patch set '${y}' failed to apply!"
339 die "FreeBSD patch set '${y}' failed to apply!"
340 fi
341 fi
342 ;;
343 "darwin-"*)
344 useq ppc-macos && \
345 ewarn " Darwin patch set '${y}' failed to apply!"
220 ;; 346 ;;
221 esac 347 esac
222 fi 348 fi
349 done
223 350
224 if [ -z "${ELT_APPLIED_PATCHES}" ] 351 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
352 if [[ ${do_portage} == "no" && \
353 ${do_reversedeps} == "no" && \
354 ${do_only_patches} == "no" && \
355 ${deptoremove} == "" ]]
225 then 356 then
226 if [ "${do_portage}" = "no" -a \ 357 ewarn "Cannot apply any patches, please file a bug about this"
227 "${do_reversedeps}" = "no" -a \ 358 break
228 "${do_only_patches}" = "no" -a \ 359
229 "${deptoremove}" = "" ]
230 then
231 # Sometimes ltmain.sh is in a subdirectory ... 360 # Sometimes ltmain.sh is in a subdirectory ...
232 if [ ! -f ${x}/configure.in -a ! -f ${x}/configure.ac ] 361 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
233 then
234 if [ -f ${x}/../configure.in -o -f ${x}/../configure.ac ] 362 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
235 then
236 cd ${x}/../ 363 cd "${x}"/../
237 fi 364 fi
238 fi
239
240 if which libtoolize &>/dev/null
241 then
242 ewarn "Cannot apply any patch, running libtoolize..."
243 libtoolize --copy --force
244 fi
245 cd ${x}
246 break
247 fi 365 fi
366
367 if type -p libtoolize &> /dev/null ; then
368 ewarn "Cannot apply any patches, running libtoolize..."
369 libtoolize --copy --force
370 fi
371 cd "${x}"
372 break
248 fi 373 fi
249 done 374 fi
375
376 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
377
378 touch "${x}/.elibtoolized"
250 done 379 done
251 380
252 if [ -f libtool ] 381 cd "${start_dir}"
253 then 382}
254 rm -f libtool 383
384uclibctoolize() {
385 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!"
386 elibtoolize
387}
388
389darwintoolize() {
390 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!"
391 elibtoolize
392}
393
394# char *VER_major(string)
395#
396# Return the Major (X of X.Y.Z) version
397#
398VER_major() {
399 [[ -z $1 ]] && return 1
400
401 local VER=$@
402 echo "${VER%%[^[:digit:]]*}"
403}
404
405# char *VER_minor(string)
406#
407# Return the Minor (Y of X.Y.Z) version
408#
409VER_minor() {
410 [[ -z $1 ]] && return 1
411
412 local VER=$@
413 VER=${VER#*.}
414 echo "${VER%%[^[:digit:]]*}"
415}
416
417# char *VER_micro(string)
418#
419# Return the Micro (Z of X.Y.Z) version.
420#
421VER_micro() {
422 [[ -z $1 ]] && return 1
423
424 local VER=$@
425 VER=${VER#*.*.}
426 echo "${VER%%[^[:digit:]]*}"
427}
428
429# int VER_to_int(string)
430#
431# Convert a string type version (2.4.0) to an int (132096)
432# for easy compairing or versions ...
433#
434VER_to_int() {
435 [[ -z $1 ]] && return 1
436
437 local VER_MAJOR=$(VER_major "$1")
438 local VER_MINOR=$(VER_minor "$1")
439 local VER_MICRO=$(VER_micro "$1")
440 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
441
442 # We make version 1.0.0 the minimum version we will handle as
443 # a sanity check ... if its less, we fail ...
444 if [[ ${VER_int} -ge 65536 ]] ; then
445 echo "${VER_int}"
446 return 0
255 fi 447 fi
256 448
257 # We need to change the pwd back to $S, as we may be called in 449 echo 1
258 # src_compile() 450 return 1
259 cd ${S}
260} 451}
261

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.65

  ViewVC Help
Powered by ViewVC 1.1.20