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

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

  ViewVC Help
Powered by ViewVC 1.1.20