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

Diff of /eclass/libtool.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20