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