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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.32  
changed lines
  Added in v.1.83

  ViewVC Help
Powered by ViewVC 1.1.20