/[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.50
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.50 2005/07/11 15:08:06 swegener 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=
22 25
23# 26#
25# 28#
26ELT_find_ltmain_sh() { 29ELT_find_ltmain_sh() {
27 local x= 30 local x=
28 local dirlist= 31 local dirlist=
29 32
30 for x in $(find "${S}" -name 'ltmain.sh') 33 for x in $(find "${S}" -name 'ltmain.sh') ; do
31 do
32 dirlist="${dirlist} ${x%/*}" 34 dirlist="${dirlist} ${x%/*}"
33 done 35 done
34 36
35 echo "${dirlist}" 37 echo "${dirlist}"
36} 38}
37 39
38# 40#
39# See if we can apply $2 on $1, and if so, do it 41# See if we can apply $2 on $1, and if so, do it
40# 42#
41ELT_try_and_apply_patch() { 43ELT_try_and_apply_patch() {
42 local ret=0 44 local ret=0
43 local patch="$2" 45 local patch="$2"
44 46
45 # We only support patchlevel of 0 - why worry if its static patches? 47 # We only support patchlevel of 0 - why worry if its static patches?
46 if patch -p0 --dry-run $1 < ${patch} &>${T}/elibtool.log 48 if patch -p0 --dry-run $1 < ${patch} &> ${T}/elibtool.log ; then
47 then
48 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch..." 49 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
49 patch -p0 $1 < ${patch} &>${T}/elibtool.log 50 patch -p0 $1 < ${patch} &>${T}/elibtool.log
50 ret=$? 51 ret=$?
51 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 52 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
52 else 53 else
53 ret=1 54 ret=1
63ELT_walk_patches() { 64ELT_walk_patches() {
64 local x= 65 local x=
65 local y= 66 local y=
66 local ret=1 67 local ret=1
67 local patch_dir= 68 local patch_dir=
69 local version=$(eval $(grep -e '^[[:space:]]*VERSION=' $1); \
70 echo "${VERSION}")
68 71
69 if [ -n "$2" ] 72 if [[ -n $2 ]] ; then
70 then
71 if [ -d "${ELT_PATCH_DIR}/$2" ] 73 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then
72 then
73 patch_dir="${ELT_PATCH_DIR}/$2" 74 patch_dir="${ELT_PATCH_DIR}/$2"
74 else 75 else
75 return ${ret} 76 return ${ret}
76 fi 77 fi
77 78
79 if [[ -z ${version} ]] ; then
80 eerror "Could not get VERSION for ${1##*/}!"
81 die "Could not get VERSION for ${1##*/}!"
82 fi
83
84 # Go through the patches in reverse order (large to small)
78 for x in $(ls -d "${patch_dir}"/* 2>/dev/null) 85 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | sort -r) ; do
79 do 86 if [[ -n ${x} && -f ${x} ]] ; then
80 if [ -n "${x}" -a -f "${x}" ] 87 local ltver=$(VER_to_int "${version}")
81 then 88 local ptver=$(VER_to_int "${x##*/}")
89
90 # If libtool version smaller than patch version, skip patch.
91 [[ ${ltver} -lt ${ptver} ]] && continue
82 # For --remove-internal-dep ... 92 # For --remove-internal-dep ...
83 if [ -n "$3" ] 93 if [[ -n $3 ]] ; then
84 then
85 # For replace @REM_INT_DEP@ with what was passed 94 # For replace @REM_INT_DEP@ with what was passed
86 # to --remove-internal-dep 95 # to --remove-internal-dep
87 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ 96 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \
88 ${T}/$$.rem_int_deps.patch 97 ${T}/$$.rem_int_deps.patch
89 98
90 x="${T}/$$.rem_int_deps.patch" 99 x="${T}/$$.rem_int_deps.patch"
91 fi 100 fi
92 101
93 if ELT_try_and_apply_patch "$1" "${x}" 102 if ELT_try_and_apply_patch "$1" "${x}" ; then
94 then
95 ret=0 103 ret=0
96 break 104 break
97 fi 105 fi
98 fi 106 fi
99 done 107 done
109 local do_reversedeps="no" 117 local do_reversedeps="no"
110 local do_only_patches="no" 118 local do_only_patches="no"
111 local deptoremove= 119 local deptoremove=
112 local my_dirlist= 120 local my_dirlist=
113 local elt_patches="portage relink max_cmd_len sed test tmp" 121 local elt_patches="portage relink max_cmd_len sed test tmp"
122 local start_dir="${PWD}"
114 123
115 my_dirlist="$(ELT_find_ltmain_sh)" 124 my_dirlist="$(ELT_find_ltmain_sh)"
116 125
117 for x in $* 126 for x in "$@" ; do
118 do
119 case "${x}" in 127 case "${x}" in
120 "--portage") 128 "--portage")
121 # Only apply portage patch, and don't 129 # Only apply portage patch, and don't
122 # 'libtoolize --copy --force' if all patches fail. 130 # 'libtoolize --copy --force' if all patches fail.
123 do_portage="yes" 131 do_portage="yes"
147 my_dirlist="${S}" 155 my_dirlist="${S}"
148 else 156 else
149 my_dirlist= 157 my_dirlist=
150 fi 158 fi
151 ;; 159 ;;
160 "--no-uclibc")
161 NO_UCLIBCTOOLIZE=1
162 ;;
163 *)
164 eerror "Invalid elibtoolize option: $x"
165 die "elibtoolize called with $x ??"
152 esac 166 esac
153 done 167 done
154 168
169 if use ppc-macos ; then
170 glibtoolize --copy --force
171 darwintoolize
172 fi
173
155 for x in ${my_dirlist} 174 for x in ${my_dirlist} ; do
156 do
157 local tmp="$(echo "${x}" | sed -e "s|${S}||")" 175 local tmp=$(echo "${x}" | sed -e "s|${S}||")
158 export ELT_APPLIED_PATCHES= 176 export ELT_APPLIED_PATCHES=
159 177
160 cd ${x} 178 cd ${x}
161 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g')..." 179 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g') ..."
162 180
163 for y in ${elt_patches} 181 for y in ${elt_patches} ; do
164 do
165 local ret=0 182 local ret=0
166 183
167 case "${y}" in 184 case "${y}" in
168 "rem-int-dep") 185 "rem-int-dep")
169 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 186 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
170 ret=$? 187 ret=$?
171 ;; 188 ;;
172 "fix-relink") 189 "fix-relink")
173 # Do not apply if we do not have the relink patch applied ... 190 # Do not apply if we do not have the relink patch applied ...
174 if [ -n "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ] 191 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
175 then
176 ELT_walk_patches "${x}/ltmain.sh" "${y}" 192 ELT_walk_patches "${x}/ltmain.sh" "${y}"
177 ret=$? 193 ret=$?
178 fi 194 fi
179 ;; 195 ;;
180 "max_cmd_len") 196 "max_cmd_len")
181 # Do not apply if $max_cmd_len is not used ... 197 # Do not apply if $max_cmd_len is not used ...
182 if [ -n "$(grep 'max_cmd_len' "${x}/ltmain.sh")" ] 198 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
183 then
184 ELT_walk_patches "${x}/ltmain.sh" "${y}" 199 ELT_walk_patches "${x}/ltmain.sh" "${y}"
185 ret=$? 200 ret=$?
186 fi 201 fi
187 ;; 202 ;;
188 *) 203 *)
189 ELT_walk_patches "${x}/ltmain.sh" "${y}" 204 ELT_walk_patches "${x}/ltmain.sh" "${y}"
190 ret=$? 205 ret=$?
191 ;; 206 ;;
192 esac 207 esac
193 208
194 if [ "${ret}" -ne 0 ] 209 if [[ ${ret} -ne 0 ]] ; then
195 then
196 case ${y} in 210 case ${y} in
197 "relink") 211 "relink")
198 # Critical patch, but could be applied ... 212 # Critical patch, but could be applied ...
199 if [ -z "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ] 213 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
200 then
201 ewarn " Could not apply relink.patch!" 214 ewarn " Could not apply relink.patch!"
202 fi 215 fi
203 ;; 216 ;;
204 "portage") 217 "portage")
205 # Critical patch - for this one we abort, as it can really 218 # Critical patch - for this one we abort, as it can really
206 # cause breakage without it applied! 219 # cause breakage without it applied!
207 if [ "${do_portage}" = "yes" ] 220 if [[ ${do_portage} == "yes" ]] ; then
208 then
209 # Stupid test to see if its already applied ... 221 # Stupid test to see if its already applied ...
210 if [ -z "$(grep 'We do not want portage' "${x}/ltmain.sh")" ] 222 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
211 then
212 echo 223 echo
213 eerror "Portage patch requested, but failed to apply!" 224 eerror "Portage patch requested, but failed to apply!"
214 die "Portage patch requested, but failed to apply!" 225 die "Portage patch requested, but failed to apply!"
215 fi 226 fi
216 else 227 else
217 ewarn " Could not apply portage.patch!" 228 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
229 ewarn " Portage patch seems to be already applied."
218 ewarn " Please verify that it is not needed." 230 ewarn " Please verify that it is not needed."
231 else
232 local version=$( \
233 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
234 echo "${VERSION}")
235
236 echo
237 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
238 die "Portage patch failed to apply!"
239 fi
240 # We do not want to run libtoolize ...
241 ELT_APPLIED_PATCHES="portage"
219 fi 242 fi
220 ;; 243 ;;
221 esac 244 esac
222 fi 245 fi
223 246
224 if [ -z "${ELT_APPLIED_PATCHES}" ] 247 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
225 then
226 if [ "${do_portage}" = "no" -a \ 248 if [[ ${do_portage} == "no" && \
227 "${do_reversedeps}" = "no" -a \ 249 ${do_reversedeps} == "no" && \
228 "${do_only_patches}" = "no" -a \ 250 ${do_only_patches} == "no" && \
229 "${deptoremove}" = "" ] 251 ${deptoremove} == "" ]]
230 then 252 then
253 ewarn "Cannot apply any patches, please file a bug about this"
254 break
255
231 # Sometimes ltmain.sh is in a subdirectory ... 256 # Sometimes ltmain.sh is in a subdirectory ...
232 if [ ! -f ${x}/configure.in -a ! -f ${x}/configure.ac ] 257 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
233 then
234 if [ -f ${x}/../configure.in -o -f ${x}/../configure.ac ] 258 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
235 then
236 cd ${x}/../ 259 cd "${x}"/../
237 fi 260 fi
238 fi 261 fi
239 262
240 if which libtoolize &>/dev/null 263 if type -p libtoolize &> /dev/null ; then
241 then
242 ewarn "Cannot apply any patch, running libtoolize..." 264 ewarn "Cannot apply any patches, running libtoolize..."
243 libtoolize --copy --force 265 libtoolize --copy --force
244 fi 266 fi
245 cd ${x} 267 cd "${x}"
246 break 268 break
247 fi 269 fi
248 fi 270 fi
249 done 271 done
250 done 272 done
251 273
252 if [ -f libtool ] 274 if [[ -f libtool ]] ; then
253 then
254 rm -f libtool 275 rm -f libtool
255 fi 276 fi
256 277
257 # We need to change the pwd back to $S, as we may be called in 278 cd "${start_dir}"
258 # src_compile()
259 cd ${S}
260}
261 279
280 uclibctoolize
281}
282
283uclibctoolize() {
284 [[ -n ${NO_UCLIBCTOOLIZE} ]] && return 0
285
286 local errmsg=""
287 [[ ${CTARGET:-${CHOST}} == *-uclibc ]] \
288 && errmsg="PLEASE CHECK" \
289 || errmsg="Already patched"
290 local targets=""
291 local x
292
293 if [[ -z $* ]] ; then
294 targets=$(find ${S} -name configure -o -name ltconfig)
295 fi
296
297 einfo "Applying uClibc/libtool patches ..."
298 for x in ${targets} ; do
299 [[ ! -s ${x} ]] && continue
300 case ${x##*/} in
301 configure)
302 if grep 'Transform linux' "${x}" > /dev/null ; then
303 ebegin " Fixing \${S}${x/${S}}"
304 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null
305 eend $? "${errmsg} ${x}"
306 fi
307 ;;
308
309 ltconfig)
310 local ver=$(grep '^VERSION=' ${x})
311 ver=${ver/VERSION=}
312 [[ ${ver:0:3} == "1.4" ]] && ver="1.3" # 1.4 and 1.3 are compat
313 ebegin " Fixing \${S}${x/${S}}"
314 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null
315 eend $? "${errmsg} ${x}"
316 ;;
317 esac
318 done
319}
320
321darwintoolize() {
322 local targets=""
323 local x
324
325 if [[ -z $* ]] ; then
326 targets=$(find ${S} -name ltmain.sh -o -name ltconfig)
327 fi
328
329 einfo "Applying Darwin/libtool patches ..."
330 for x in ${targets} ; do
331 [[ ! -s ${x} ]] && continue
332 case ${x##*/} in
333 ltmain.sh|ltconfig)
334 local ver=$(grep '^VERSION=' ${x})
335 ver=${ver/VERSION=}
336 if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then
337 ver="1.3" # 1.4, 1.5 and 1.3 are compat
338 fi
339
340 ebegin " Fixing \${S}${x/${S}}"
341 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null
342 eend $? "PLEASE CHECK ${x}"
343 ;;
344 esac
345 done
346}
347
348# char *VER_major(string)
349#
350# Return the Major (X of X.Y.Z) version
351#
352VER_major() {
353 [[ -z $1 ]] && return 1
354
355 local VER=$@
356 echo ${VER%%[^[:digit:]]*}
357}
358
359# char *VER_minor(string)
360#
361# Return the Minor (Y of X.Y.Z) version
362#
363VER_minor() {
364 [[ -z $1 ]] && return 1
365
366 local VER=$@
367 VER=${VER#*.}
368 echo ${VER%%[^[:digit:]]*}
369}
370
371# char *VER_micro(string)
372#
373# Return the Micro (Z of X.Y.Z) version.
374#
375VER_micro() {
376 [[ -z $1 ]] && return 1
377
378 local VER=$@
379 VER=${VER#*.*.}
380 echo ${VER%%[^[:digit:]]*}
381}
382
383# int VER_to_int(string)
384#
385# Convert a string type version (2.4.0) to an int (132096)
386# for easy compairing or versions ...
387#
388VER_to_int() {
389 [[ -z $1 ]] && return 1
390
391 local VER_MAJOR=$(VER_major "$1")
392 local VER_MINOR=$(VER_minor "$1")
393 local VER_MICRO=$(VER_micro "$1")
394 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
395
396 # We make version 1.0.0 the minimum version we will handle as
397 # a sanity check ... if its less, we fail ...
398 if [[ ${VER_int} -ge 65536 ]] ; then
399 echo "${VER_int}"
400 return 0
401 fi
402
403 echo 1
404 return 1
405}

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

  ViewVC Help
Powered by ViewVC 1.1.20