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

Diff of /eclass/libtool.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20