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

Diff of /eclass/libtool.eclass

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

Revision 1.34 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.34 2004/09/25 19:59:51 rac 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.
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
21#DEPEND="!bootstrap? ( sys-devel/libtool )"
22 13
23DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
24 15
25ELIBTOOL_VERSION="2.0.1" 16ELIBTOOL_VERSION="2.0.2"
26 17
18inherit toolchain-funcs
27 19
28ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" 20ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
29ELT_APPLIED_PATCHES= 21ELT_APPLIED_PATCHES=
22ELT_LTMAIN_SH=
30 23
31# 24#
32# Returns all the directories containing ltmain.sh 25# Returns all the directories containing ltmain.sh
33# 26#
34ELT_find_ltmain_sh() { 27ELT_find_ltmain_sh() {
35 local x= 28 local x=
36 local dirlist= 29 local dirlist=
37 30
38 for x in $(find "${S}" -name 'ltmain.sh') 31 for x in $(find "${S}" -name 'ltmain.sh') ; do
39 do
40 dirlist="${dirlist} ${x%/*}" 32 dirlist="${dirlist} ${x%/*}"
41 done 33 done
42 34
43 echo "${dirlist}" 35 echo "${dirlist}"
44} 36}
… …
46# 38#
47# 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
48# 40#
49ELT_try_and_apply_patch() { 41ELT_try_and_apply_patch() {
50 local ret=0 42 local ret=0
43 local file=$1
51 local patch="$2" 44 local patch=$2
52 45
53 # 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?
54 if patch -p0 --dry-run $1 < ${patch} &>${T}/elibtool.log 47 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
55 then
56 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch..." 48 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
57 patch -p0 $1 < ${patch} &>${T}/elibtool.log 49 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
50 &> "${T}/elibtool.log"
58 ret=$? 51 ret=$?
59 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 52 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
60 else 53 else
61 ret=1 54 ret=1
62 fi 55 fi
63 56
64 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}"
65} 72}
66 73
67# 74#
68# Run through the patches in $2 and see if any 75# Run through the patches in $2 and see if any
69# apply to $1 ... 76# apply to $1 ...
70# 77#
71ELT_walk_patches() { 78ELT_walk_patches() {
72 local x= 79 local x=
73 local y= 80 local y=
74 local ret=1 81 local ret=1
82 local file=$1
83 local patch_set=$2
75 local patch_dir= 84 local patch_dir=
85 local rem_int_dep=$3
76 86
77 if [ -n "$2" ] 87 if [[ -n ${patch_set} ]] ; then
78 then 88 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
79 if [ -d "${ELT_PATCH_DIR}/$2" ]
80 then
81 patch_dir="${ELT_PATCH_DIR}/$2" 89 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
82 else 90 else
83 return ${ret} 91 return "${ret}"
84 fi 92 fi
85 93
94 # Go through the patches in reverse order (large to small)
86 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
87 do 96 if [[ -n ${x} && -f ${x} ]] ; then
88 if [ -n "${x}" -a -f "${x}" ]
89 then
90 # For --remove-internal-dep ... 97 # For --remove-internal-dep ...
91 if [ -n "$3" ] 98 if [[ -n ${rem_int_dep} ]] ; then
92 then
93 # For replace @REM_INT_DEP@ with what was passed 99 # For replace @REM_INT_DEP@ with what was passed
94 # to --remove-internal-dep 100 # to --remove-internal-dep
95 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ 101 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
96 ${T}/$$.rem_int_deps.patch 102 "${T}/$$.rem_int_deps.patch"
97 103
98 x="${T}/$$.rem_int_deps.patch" 104 x="${T}/$$.rem_int_deps.patch"
99 fi 105 fi
100 106
101 if ELT_try_and_apply_patch "$1" "${x}" 107 if ELT_try_and_apply_patch "${file}" "${x}" ; then
102 then
103 ret=0 108 ret=0
104 break 109 break
105 fi 110 fi
106 fi 111 fi
107 done 112 done
108 fi 113 fi
109 114
110 return ${ret} 115 return "${ret}"
111} 116}
112 117
113elibtoolize() { 118elibtoolize() {
114 local x= 119 local x=
115 local y= 120 local y=
116 local do_portage="no" 121 local do_portage="no"
117 local do_reversedeps="no" 122 local do_reversedeps="no"
118 local do_only_patches="no" 123 local do_only_patches="no"
124 local do_uclibc="yes"
119 local deptoremove= 125 local deptoremove=
120 local my_dirlist= 126 local my_dirlist=
121 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"
122 local start_dir="${PWD}" 128 local start_dir=${PWD}
123 129
124 my_dirlist="$(ELT_find_ltmain_sh)" 130 my_dirlist=$(ELT_find_ltmain_sh)
125 131
126 for x in "$@" 132 for x in "$@" ; do
127 do
128 case "${x}" in 133 case "${x}" in
129 "--portage") 134 "--portage")
130 # Only apply portage patch, and don't 135 # Only apply portage patch, and don't
131 # 'libtoolize --copy --force' if all patches fail. 136 # 'libtoolize --copy --force' if all patches fail.
132 do_portage="yes" 137 do_portage="yes"
… …
142 do_only_patches="yes" 147 do_only_patches="yes"
143 ;; 148 ;;
144 "^--remove-internal-dep="*) 149 "^--remove-internal-dep="*)
145 # We will replace @REM_INT_DEP@ with what is needed 150 # We will replace @REM_INT_DEP@ with what is needed
146 # in ELT_walk_patches() ... 151 # in ELT_walk_patches() ...
147 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" 152 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
148 153
149 # Add the patch for this ... 154 # Add the patch for this ...
150 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" 155 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
151 ;; 156 ;;
152 "--shallow") 157 "--shallow")
153 # Only patch the ltmain.sh in ${S} 158 # Only patch the ltmain.sh in ${S}
154 if [ -f "${S}/ltmain.sh" ] 159 if [[ -f ${S}/ltmain.sh ]] ; then
155 then
156 my_dirlist="${S}" 160 my_dirlist=${S}
157 else 161 else
158 my_dirlist= 162 my_dirlist=
159 fi 163 fi
160 ;; 164 ;;
165 "--no-uclibc")
166 do_uclibc="no"
167 ;;
168 *)
169 eerror "Invalid elibtoolize option: ${x}"
170 die "elibtoolize called with ${x} ??"
161 esac 171 esac
162 done 172 done
163 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
164 for x in ${my_dirlist} 183 for x in ${my_dirlist} ; do
165 do
166 local tmp="$(echo "${x}" | sed -e "s|${S}||")" 184 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
167 export ELT_APPLIED_PATCHES= 185 export ELT_APPLIED_PATCHES=
186 export ELT_LTMAIN_SH="${x}/ltmain.sh"
187
188 [[ -f ${x}/.elibtoolized ]] && continue
168 189
169 cd ${x} 190 cd ${x}
170 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g')..." 191 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
171 192
172 for y in ${elt_patches} 193 for y in ${elt_patches} ; do
173 do
174 local ret=0 194 local ret=0
175 195
176 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 ;;
177 "rem-int-dep") 204 "rem-int-dep")
178 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 205 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
179 ret=$? 206 ret=$?
180 ;; 207 ;;
181 "fix-relink") 208 "fix-relink")
182 # 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 ...
183 if [ -n "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ] 210 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
184 then
185 ELT_walk_patches "${x}/ltmain.sh" "${y}" 211 ELT_walk_patches "${x}/ltmain.sh" "${y}"
186 ret=$? 212 ret=$?
187 fi 213 fi
188 ;; 214 ;;
189 "max_cmd_len") 215 "max_cmd_len")
190 # Do not apply if $max_cmd_len is not used ... 216 # Do not apply if $max_cmd_len is not used ...
191 if [ -n "$(grep 'max_cmd_len' "${x}/ltmain.sh")" ] 217 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
192 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
193 ELT_walk_patches "${x}/ltmain.sh" "${y}" 276 ELT_walk_patches "${x}/ltmain.sh" "${y}"
194 ret=$? 277 ret=$?
195 fi 278 fi
196 ;; 279 ;;
197 *) 280 *)
198 ELT_walk_patches "${x}/ltmain.sh" "${y}" 281 ELT_walk_patches "${x}/ltmain.sh" "${y}"
199 ret=$? 282 ret=$?
200 ;; 283 ;;
201 esac 284 esac
202 285
203 if [ "${ret}" -ne 0 ] 286 if [[ ${ret} -ne 0 ]] ; then
204 then
205 case ${y} in 287 case ${y} in
206 "relink") 288 "relink")
289 local version=$(ELT_libtool_version "${x}/ltmain.sh")
207 # 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
208 if [ -z "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ] 292 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
209 then 293 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
210 ewarn " Could not apply relink.patch!" 294 ewarn " Could not apply relink.patch!"
211 fi 295 fi
212 ;; 296 ;;
213 "portage") 297 "portage")
214 # Critical patch - for this one we abort, as it can really 298 # Critical patch - for this one we abort, as it can really
215 # cause breakage without it applied! 299 # cause breakage without it applied!
216 if [ "${do_portage}" = "yes" ] 300 if [[ ${do_portage} == "yes" ]] ; then
217 then
218 # Stupid test to see if its already applied ... 301 # Stupid test to see if its already applied ...
219 if [ -z "$(grep 'We do not want portage' "${x}/ltmain.sh")" ] 302 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
220 then
221 echo 303 echo
222 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."
223 die "Portage patch requested, but failed to apply!" 306 die "Portage patch requested, but failed to apply!"
224 fi 307 fi
225 else 308 else
226 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."
227 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"
228 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!"
229 ;; 343 ;;
230 esac 344 esac
231 fi 345 fi
346 done
232 347
233 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} == "" ]]
234 then 353 then
235 if [ "${do_portage}" = "no" -a \ 354 ewarn "Cannot apply any patches, please file a bug about this"
236 "${do_reversedeps}" = "no" -a \
237 "${do_only_patches}" = "no" -a \
238 "${deptoremove}" = "" ]
239 then
240 # Sometimes ltmain.sh is in a subdirectory ...
241 if [ ! -f ${x}/configure.in -a ! -f ${x}/configure.ac ]
242 then
243 if [ -f ${x}/../configure.in -o -f ${x}/../configure.ac ]
244 then
245 cd ${x}/../
246 fi
247 fi
248
249 if which libtoolize &>/dev/null
250 then
251 ewarn "Cannot apply any patch, running libtoolize..."
252 libtoolize --copy --force
253 fi
254 cd ${x}
255 break
256 fi 355 die
257 fi 356 fi
258 done 357 fi
358
359 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
360
361 >> "${x}/.elibtoolized"
259 done 362 done
260 363
261 if [ -f libtool ] 364 cd "${start_dir}"
262 then 365}
263 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
264 fi 430 fi
265 431
266 cd "${start_dir}" 432 echo 1
267 433 return 1
268 uclibctoolize
269} 434}
270
271uclibctoolize() {
272 local targets=""
273 local x
274
275 if [ -z "$@" ] ; then
276 targets="$(find ${S} -name configure -o -name ltconfig)"
277 fi
278
279 einfo "Applying uClibc/libtool patches ..."
280 for x in ${targets} ; do
281 case $(basename "${x}") in
282 configure)
283 if grep 'Transform linux' "${x}" >/dev/null ; then
284 ebegin " Fixing \${S}${x/${S}}"
285 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null
286 eend $? "PLEASE CHECK ${x}"
287 fi
288 ;;
289
290 ltconfig)
291 local ver="$(grep '^VERSION=' ${x})"
292 ver="${ver/VERSION=}"
293 [ "${ver:0:3}" == "1.4" ] && ver="1.3" # 1.4 and 1.3 are compat
294 ebegin " Fixing \${S}${x/${S}}"
295 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null
296 eend $? "PLEASE CHECK ${x}"
297 ;;
298 esac
299 done
300}
Legend:
Removed from v.1.34  
changed lines
  Added in v.1.83
  ViewVC Help
Powered by ViewVC 1.1.13