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

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

  ViewVC Help
Powered by ViewVC 1.1.20