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

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

  ViewVC Help
Powered by ViewVC 1.1.20