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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.74

  ViewVC Help
Powered by ViewVC 1.1.20