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

Diff of /eclass/libtool.eclass

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

Revision 1.42 Revision 1.82
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2007 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.42 2005/01/31 03:02:13 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.82 2009/03/14 13:02:08 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Maintainer: base-system@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" 10# Note, this eclass does not require libtool as it only applies patches to
11INHERITED="${INHERITED} ${ECLASS}" 11# generated libtool files. We do not run the libtoolize program because that
12 12# requires a regeneration of the main autotool files in order to work properly.
13# 2004.09.25 rac
14# i have verified that at least one package can use this eclass and
15# build properly even without libtool installed yet, probably using
16# the files in the distribution. eliminating this dependency fixes
17# bug 65209, which is a showstopper for people doing installs using
18# stageballs <3. if anybody decides to revert this, please attempt
19# to find an alternate way of resolving that bug at the same time.
20 13
21DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
22 15
23ELIBTOOL_VERSION="2.0.1" 16ELIBTOOL_VERSION="2.0.2"
24 17
18inherit toolchain-funcs
19
25ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" 20ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
26ELT_APPLIED_PATCHES= 21ELT_APPLIED_PATCHES=
22ELT_LTMAIN_SH=
27 23
28# 24#
29# Returns all the directories containing ltmain.sh 25# Returns all the directories containing ltmain.sh
30# 26#
31ELT_find_ltmain_sh() { 27ELT_find_ltmain_sh() {
42# 38#
43# See if we can apply $2 on $1, and if so, do it 39# See if we can apply $2 on $1, and if so, do it
44# 40#
45ELT_try_and_apply_patch() { 41ELT_try_and_apply_patch() {
46 local ret=0 42 local ret=0
43 local file=$1
47 local patch="$2" 44 local patch=$2
48 45
49 # We only support patchlevel of 0 - why worry if its static patches? 46 # We only support patchlevel of 0 - why worry if its static patches?
50 if patch -p0 --dry-run $1 < ${patch} &> ${T}/elibtool.log ; then 47 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." 48 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
52 patch -p0 $1 < ${patch} &>${T}/elibtool.log 49 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
50 &> "${T}/elibtool.log"
53 ret=$? 51 ret=$?
54 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 52 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
55 else 53 else
56 ret=1 54 ret=1
57 fi 55 fi
58 56
59 return ${ret} 57 return "${ret}"
58}
59
60#
61# Get string version of ltmain.sh or ltconfig (passed as $1)
62#
63ELT_libtool_version() {
64 local ltmain_sh=$1
65 local version=
66
67 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
68 echo "${VERSION}")
69 [[ -z ${version} ]] && version="0"
70
71 echo "${version}"
60} 72}
61 73
62# 74#
63# Run through the patches in $2 and see if any 75# Run through the patches in $2 and see if any
64# apply to $1 ... 76# apply to $1 ...
65# 77#
66ELT_walk_patches() { 78ELT_walk_patches() {
67 local x= 79 local x=
68 local y= 80 local y=
69 local ret=1 81 local ret=1
82 local file=$1
83 local patch_set=$2
70 local patch_dir= 84 local patch_dir=
85 local rem_int_dep=$3
71 86
72 if [[ -n $2 ]] ; then 87 if [[ -n ${patch_set} ]] ; then
73 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then 88 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
74 patch_dir="${ELT_PATCH_DIR}/$2" 89 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
75 else 90 else
76 return ${ret} 91 return "${ret}"
77 fi 92 fi
78 93
94 # Go through the patches in reverse order (large to small)
79 for x in $(ls -d "${patch_dir}"/* 2> /dev/null) ; do 95 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
80 if [[ -n ${x} && -f ${x} ]] ; then 96 if [[ -n ${x} && -f ${x} ]] ; then
81 # For --remove-internal-dep ... 97 # For --remove-internal-dep ...
82 if [[ -n $3 ]] ; then 98 if [[ -n ${rem_int_dep} ]] ; then
83 # For replace @REM_INT_DEP@ with what was passed 99 # For replace @REM_INT_DEP@ with what was passed
84 # to --remove-internal-dep 100 # to --remove-internal-dep
85 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ 101 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
86 ${T}/$$.rem_int_deps.patch 102 "${T}/$$.rem_int_deps.patch"
87 103
88 x="${T}/$$.rem_int_deps.patch" 104 x="${T}/$$.rem_int_deps.patch"
89 fi 105 fi
90 106
91 if ELT_try_and_apply_patch "$1" "${x}" ; then 107 if ELT_try_and_apply_patch "${file}" "${x}" ; then
92 ret=0 108 ret=0
93 break 109 break
94 fi 110 fi
95 fi 111 fi
96 done 112 done
97 fi 113 fi
98 114
99 return ${ret} 115 return "${ret}"
100} 116}
101 117
102elibtoolize() { 118elibtoolize() {
103 local x= 119 local x=
104 local y= 120 local y=
105 local do_portage="no" 121 local do_portage="no"
106 local do_reversedeps="no" 122 local do_reversedeps="no"
107 local do_only_patches="no" 123 local do_only_patches="no"
124 local do_uclibc="yes"
108 local deptoremove= 125 local deptoremove=
109 local my_dirlist= 126 local my_dirlist=
110 local elt_patches="portage relink max_cmd_len sed test tmp" 127 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross"
111 local start_dir="${PWD}" 128 local start_dir=${PWD}
112 129
113 my_dirlist="$(ELT_find_ltmain_sh)" 130 my_dirlist=$(ELT_find_ltmain_sh)
114 131
115 for x in "$@" ; do 132 for x in "$@" ; do
116 case "${x}" in 133 case "${x}" in
117 "--portage") 134 "--portage")
118 # Only apply portage patch, and don't 135 # Only apply portage patch, and don't
130 do_only_patches="yes" 147 do_only_patches="yes"
131 ;; 148 ;;
132 "^--remove-internal-dep="*) 149 "^--remove-internal-dep="*)
133 # We will replace @REM_INT_DEP@ with what is needed 150 # We will replace @REM_INT_DEP@ with what is needed
134 # in ELT_walk_patches() ... 151 # in ELT_walk_patches() ...
135 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" 152 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
136 153
137 # Add the patch for this ... 154 # Add the patch for this ...
138 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" 155 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
139 ;; 156 ;;
140 "--shallow") 157 "--shallow")
141 # Only patch the ltmain.sh in ${S} 158 # Only patch the ltmain.sh in ${S}
142 if [ -f "${S}/ltmain.sh" ] 159 if [[ -f ${S}/ltmain.sh ]] ; then
143 then
144 my_dirlist="${S}" 160 my_dirlist=${S}
145 else 161 else
146 my_dirlist= 162 my_dirlist=
147 fi 163 fi
148 ;; 164 ;;
149 "--no-uclibc") 165 "--no-uclibc")
150 NO_UCLIBCTOOLIZE=1 166 do_uclibc="no"
151 ;; 167 ;;
152 *) 168 *)
153 eerror "Invalid elibtoolize option: $x" 169 eerror "Invalid elibtoolize option: ${x}"
154 die "elibtoolize called with $x ??" 170 die "elibtoolize called with ${x} ??"
155 esac 171 esac
156 done 172 done
157 173
158 if use ppc-macos ; then 174 [[ ${do_uclibc} == "yes" ]] && \
159 glibtoolize --copy --force 175 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
160 darwintoolize 176
161 fi 177 [[ ${CHOST} == *"-freebsd"* ]] && \
178 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
179
180 [[ ${CHOST} == *"-darwin"* ]] && \
181 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
162 182
163 for x in ${my_dirlist} ; do 183 for x in ${my_dirlist} ; do
164 local tmp=$(echo "${x}" | sed -e "s|${S}||") 184 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
165 export ELT_APPLIED_PATCHES= 185 export ELT_APPLIED_PATCHES=
186 export ELT_LTMAIN_SH="${x}/ltmain.sh"
187
188 [[ -f ${x}/.elibtoolized ]] && continue
166 189
167 cd ${x} 190 cd ${x}
168 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g') ..." 191 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
169 192
170 for y in ${elt_patches} ; do 193 for y in ${elt_patches} ; do
171 local ret=0 194 local ret=0
172 195
173 case "${y}" in 196 case "${y}" in
197 "portage")
198 # Stupid test to see if its already applied ...
199 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
200 ELT_walk_patches "${x}/ltmain.sh" "${y}"
201 ret=$?
202 fi
203 ;;
174 "rem-int-dep") 204 "rem-int-dep")
175 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 205 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
176 ret=$? 206 ret=$?
177 ;; 207 ;;
178 "fix-relink") 208 "fix-relink")
187 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 217 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
188 ELT_walk_patches "${x}/ltmain.sh" "${y}" 218 ELT_walk_patches "${x}/ltmain.sh" "${y}"
189 ret=$? 219 ret=$?
190 fi 220 fi
191 ;; 221 ;;
222 "uclibc-conf")
223 if [[ -e ${x}/configure && \
224 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
225 ELT_walk_patches "${x}/configure" "${y}"
226 ret=$?
227 # ltmain.sh and co might be in a subdirectory ...
228 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
229 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
230 ELT_walk_patches "${x}/../configure" "${y}"
231 ret=$?
232 fi
233 ;;
234 "uclibc-ltconf")
235 # Newer libtoolize clears ltconfig, as not used anymore
236 if [[ -s ${x}/ltconfig ]] ; then
237 ELT_walk_patches "${x}/ltconfig" "${y}"
238 ret=$?
239 fi
240 ;;
241 "fbsd-conf")
242 if [[ -e ${x}/configure && \
243 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
244 ELT_walk_patches "${x}/configure" "${y}"
245 ret=$?
246 # ltmain.sh and co might be in a subdirectory ...
247 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
248 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
249 ELT_walk_patches "${x}/../configure" "${y}"
250 ret=$?
251 fi
252 ;;
253 "fbsd-ltconf")
254 if [[ -s ${x}/ltconfig ]] ; then
255 ELT_walk_patches "${x}/ltconfig" "${y}"
256 ret=$?
257 fi
258 ;;
259 "darwin-ltconf")
260 # Newer libtoolize clears ltconfig, as not used anymore
261 if [[ -s ${x}/ltconfig ]] ; then
262 ELT_walk_patches "${x}/ltconfig" "${y}"
263 ret=$?
264 fi
265 ;;
266 "install-sh")
267 ELT_walk_patches "${x}/install-sh" "${y}"
268 ret=$?
269 ;;
270 "cross")
271 if tc-is-cross-compiler ; then
272 ELT_walk_patches "${x}/ltmain.sh" "${y}"
273 ret=$?
274 fi
275 ;;
192 *) 276 *)
193 ELT_walk_patches "${x}/ltmain.sh" "${y}" 277 ELT_walk_patches "${x}/ltmain.sh" "${y}"
194 ret=$? 278 ret=$?
195 ;; 279 ;;
196 esac 280 esac
197 281
198 if [[ ${ret} -ne 0 ]] ; then 282 if [[ ${ret} -ne 0 ]] ; then
199 case ${y} in 283 case ${y} in
200 "relink") 284 "relink")
285 local version=$(ELT_libtool_version "${x}/ltmain.sh")
201 # Critical patch, but could be applied ... 286 # Critical patch, but could be applied ...
287 # FIXME: Still need a patch for ltmain.sh > 1.4.0
202 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 288 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
289 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
203 ewarn " Could not apply relink.patch!" 290 ewarn " Could not apply relink.patch!"
204 fi 291 fi
205 ;; 292 ;;
206 "portage") 293 "portage")
207 # Critical patch - for this one we abort, as it can really 294 # Critical patch - for this one we abort, as it can really
209 if [[ ${do_portage} == "yes" ]] ; then 296 if [[ ${do_portage} == "yes" ]] ; then
210 # Stupid test to see if its already applied ... 297 # Stupid test to see if its already applied ...
211 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 298 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
212 echo 299 echo
213 eerror "Portage patch requested, but failed to apply!" 300 eerror "Portage patch requested, but failed to apply!"
301 eerror "Please bug azarah or vapier to add proper patch."
214 die "Portage patch requested, but failed to apply!" 302 die "Portage patch requested, but failed to apply!"
215 fi 303 fi
216 else 304 else
217 ewarn " Could not apply portage.patch!" 305 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
306 # ewarn " Portage patch seems to be already applied."
218 ewarn " Please verify that it is not needed." 307 # ewarn " Please verify that it is not needed."
308 :
309 else
310 local version=$( \
311 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
312 echo "${VERSION}")
313
314 echo
315 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
316 eerror "Please bug azarah or vapier to add proper patch."
317 die "Portage patch failed to apply!"
318 fi
319 # We do not want to run libtoolize ...
320 ELT_APPLIED_PATCHES="portage"
219 fi 321 fi
322 ;;
323 "uclibc-"*)
324 [[ ${CHOST} == *"-uclibc" ]] && \
325 ewarn " uClibc patch set '${y}' failed to apply!"
326 ;;
327 "fbsd-"*)
328 if [[ ${CHOST} == *"-freebsd"* ]] ; then
329 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
330 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
331 eerror " FreeBSD patch set '${y}' failed to apply!"
332 die "FreeBSD patch set '${y}' failed to apply!"
333 fi
334 fi
335 ;;
336 "darwin-"*)
337 [[ ${CHOST} == *"-darwin"* ]] && \
338 ewarn " Darwin patch set '${y}' failed to apply!"
220 ;; 339 ;;
221 esac 340 esac
222 fi 341 fi
342 done
223 343
224 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then 344 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
225 if [[ ${do_portage} == "no" && \ 345 if [[ ${do_portage} == "no" && \
226 ${do_reversedeps} == "no" && \ 346 ${do_reversedeps} == "no" && \
227 ${do_only_patches} == "no" && \ 347 ${do_only_patches} == "no" && \
228 ${deptoremove} == "" ]] 348 ${deptoremove} == "" ]]
229 then 349 then
230 # Sometimes ltmain.sh is in a subdirectory ... 350 ewarn "Cannot apply any patches, please file a bug about this"
231 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
232 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
233 cd "${x}"/../
234 fi
235 fi
236
237 if type -p libtoolize &> /dev/null ; then
238 ewarn "Cannot apply any patch, running libtoolize..."
239 libtoolize --copy --force
240 fi
241 cd "${x}"
242 break
243 fi 351 die
244 fi 352 fi
245 done 353 fi
354
355 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
356
357 >> "${x}/.elibtoolized"
246 done 358 done
247 359
248 if [[ -f libtool ]] ; then 360 cd "${start_dir}"
249 rm -f libtool 361}
362
363uclibctoolize() {
364 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
365 elibtoolize
366}
367
368darwintoolize() {
369 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
370 elibtoolize
371}
372
373# char *VER_major(string)
374#
375# Return the Major (X of X.Y.Z) version
376#
377VER_major() {
378 [[ -z $1 ]] && return 1
379
380 local VER=$@
381 echo "${VER%%[^[:digit:]]*}"
382}
383
384# char *VER_minor(string)
385#
386# Return the Minor (Y of X.Y.Z) version
387#
388VER_minor() {
389 [[ -z $1 ]] && return 1
390
391 local VER=$@
392 VER=${VER#*.}
393 echo "${VER%%[^[:digit:]]*}"
394}
395
396# char *VER_micro(string)
397#
398# Return the Micro (Z of X.Y.Z) version.
399#
400VER_micro() {
401 [[ -z $1 ]] && return 1
402
403 local VER=$@
404 VER=${VER#*.*.}
405 echo "${VER%%[^[:digit:]]*}"
406}
407
408# int VER_to_int(string)
409#
410# Convert a string type version (2.4.0) to an int (132096)
411# for easy compairing or versions ...
412#
413VER_to_int() {
414 [[ -z $1 ]] && return 1
415
416 local VER_MAJOR=$(VER_major "$1")
417 local VER_MINOR=$(VER_minor "$1")
418 local VER_MICRO=$(VER_micro "$1")
419 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
420
421 # We make version 1.0.0 the minimum version we will handle as
422 # a sanity check ... if its less, we fail ...
423 if [[ ${VER_int} -ge 65536 ]] ; then
424 echo "${VER_int}"
425 return 0
250 fi 426 fi
251 427
252 cd "${start_dir}" 428 echo 1
253 429 return 1
254 uclibctoolize
255} 430}
256
257uclibctoolize() {
258 [[ -n ${NO_UCLIBCTOOLIZE} ]] && return 0
259
260 local errmsg=""
261 [[ ${CTARGET:-${CHOST}} == *-uclibc ]] \
262 && errmsg="PLEASE CHECK" \
263 || errmsg="Already patched"
264 local targets=""
265 local x
266
267 if [[ -z $* ]] ; then
268 targets=$(find ${S} -name configure -o -name ltconfig)
269 fi
270
271 einfo "Applying uClibc/libtool patches ..."
272 for x in ${targets} ; do
273 [[ ! -s ${x} ]] && continue
274 case ${x##*/} in
275 configure)
276 if grep 'Transform linux' "${x}" > /dev/null ; then
277 ebegin " Fixing \${S}${x/${S}}"
278 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null
279 eend $? "${errmsg} ${x}"
280 fi
281 ;;
282
283 ltconfig)
284 local ver=$(grep '^VERSION=' ${x})
285 ver=${ver/VERSION=}
286 [[ ${ver:0:3} == "1.4" ]] && ver="1.3" # 1.4 and 1.3 are compat
287 ebegin " Fixing \${S}${x/${S}}"
288 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null
289 eend $? "${errmsg} ${x}"
290 ;;
291 esac
292 done
293}
294
295darwintoolize() {
296 local targets=""
297 local x
298
299 if [[ -z $* ]] ; then
300 targets=$(find ${S} -name ltmain.sh -o -name ltconfig)
301 fi
302
303 einfo "Applying Darwin/libtool patches ..."
304 for x in ${targets} ; do
305 [[ ! -s ${x} ]] && continue
306 case ${x##*/} in
307 ltmain.sh|ltconfig)
308 local ver=$(grep '^VERSION=' ${x})
309 ver=${ver/VERSION=}
310 if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then
311 ver="1.3" # 1.4, 1.5 and 1.3 are compat
312 fi
313
314 ebegin " Fixing \${S}${x/${S}}"
315 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null
316 eend $? "PLEASE CHECK ${x}"
317 ;;
318 esac
319 done
320}

Legend:
Removed from v.1.42  
changed lines
  Added in v.1.82

  ViewVC Help
Powered by ViewVC 1.1.20