/[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.54
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.54 2005/09/04 15:15:37 swegener 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() {
… …
66ELT_walk_patches() { 65ELT_walk_patches() {
67 local x= 66 local x=
68 local y= 67 local y=
69 local ret=1 68 local ret=1
70 local patch_dir= 69 local patch_dir=
70 local version=
71 local ltmain_sh=$1
72
73 [[ $1 == *"/configure" ]] && ltmain_sh=${ELT_LTMAIN_SH}
74 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
75 echo "${VERSION}")
71 76
72 if [[ -n $2 ]] ; then 77 if [[ -n $2 ]] ; then
73 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then 78 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then
74 patch_dir="${ELT_PATCH_DIR}/$2" 79 patch_dir="${ELT_PATCH_DIR}/$2"
75 else 80 else
76 return ${ret} 81 return ${ret}
77 fi 82 fi
78 83
84 if [[ -z ${version} ]] ; then
85 eerror "Could not get VERSION for ${1##*/}!"
86 die "Could not get VERSION for ${1##*/}!"
87 fi
88
89 # Go through the patches in reverse order (large to small)
79 for x in $(ls -d "${patch_dir}"/* 2> /dev/null) ; do 90 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | sort -r) ; do
80 if [[ -n ${x} && -f ${x} ]] ; then 91 if [[ -n ${x} && -f ${x} ]] ; then
92 local ltver=$(VER_to_int "${version}")
93 local ptver=$(VER_to_int "${x##*/}")
94
95 # If libtool version smaller than patch version, skip patch.
96 [[ ${ltver} -lt ${ptver} ]] && continue
81 # For --remove-internal-dep ... 97 # For --remove-internal-dep ...
82 if [[ -n $3 ]] ; then 98 if [[ -n $3 ]] ; then
83 # For replace @REM_INT_DEP@ with what was passed 99 # For replace @REM_INT_DEP@ with what was passed
84 # to --remove-internal-dep 100 # to --remove-internal-dep
85 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ 101 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \
… …
105 local do_portage="no" 121 local do_portage="no"
106 local do_reversedeps="no" 122 local do_reversedeps="no"
107 local do_only_patches="no" 123 local do_only_patches="no"
108 local deptoremove= 124 local deptoremove=
109 local my_dirlist= 125 local my_dirlist=
110 local elt_patches="portage relink max_cmd_len sed test tmp" 126 local elt_patches="portage relink max_cmd_len sed test tmp \
127 uclibc-conf uclibc-ltconf"
111 local start_dir="${PWD}" 128 local start_dir="${PWD}"
112 129
113 my_dirlist="$(ELT_find_ltmain_sh)" 130 my_dirlist="$(ELT_find_ltmain_sh)"
114 131
115 for x in "$@" ; do 132 for x in "$@" ; do
… …
154 die "elibtoolize called with $x ??" 171 die "elibtoolize called with $x ??"
155 esac 172 esac
156 done 173 done
157 174
158 if use ppc-macos ; then 175 if use ppc-macos ; then
176 local opts
177 [[ -f Makefile.am ]] && opts="--automake"
159 glibtoolize --copy --force 178 glibtoolize --copy --force ${opts}
160 darwintoolize 179 darwintoolize
161 fi 180 fi
162 181
163 for x in ${my_dirlist} ; do 182 for x in ${my_dirlist} ; do
164 local tmp=$(echo "${x}" | sed -e "s|${S}||") 183 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
165 export ELT_APPLIED_PATCHES= 184 export ELT_APPLIED_PATCHES=
185 export ELT_LTMAIN_SH="${x}/ltmain.sh"
186
187 [[ -f ${x}/.elibtoolized ]] && continue
166 188
167 cd ${x} 189 cd ${x}
168 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g') ..." 190 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
169 191
170 for y in ${elt_patches} ; do 192 for y in ${elt_patches} ; do
171 local ret=0 193 local ret=0
172 194
173 case "${y}" in 195 case "${y}" in
… …
184 ;; 206 ;;
185 "max_cmd_len") 207 "max_cmd_len")
186 # Do not apply if $max_cmd_len is not used ... 208 # Do not apply if $max_cmd_len is not used ...
187 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 209 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
188 ELT_walk_patches "${x}/ltmain.sh" "${y}" 210 ELT_walk_patches "${x}/ltmain.sh" "${y}"
211 ret=$?
212 fi
213 ;;
214 "uclibc-conf")
215 if [[ -e ${x}/configure ]] && \
216 grep 'Transform linux' "${x}/configure" > /dev/null ; then
217 ELT_walk_patches "${x}/configure" "${y}"
218 ret=$?
219 # ltmain.sh and co might be in a subdirectory ...
220 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] && \
221 grep 'Transform linux' "${x}/../configure" > /dev/null ; then
222 ELT_walk_patches "${x}/../configure" "${y}"
223 ret=$?
224 fi
225 ;;
226 "uclibc-ltconf")
227 if [[ -e ${x}/ltconfig ]] ; then
228 ELT_walk_patches "${x}/ltconfig" "${y}"
189 ret=$? 229 ret=$?
190 fi 230 fi
191 ;; 231 ;;
192 *) 232 *)
193 ELT_walk_patches "${x}/ltmain.sh" "${y}" 233 ELT_walk_patches "${x}/ltmain.sh" "${y}"
… …
212 echo 252 echo
213 eerror "Portage patch requested, but failed to apply!" 253 eerror "Portage patch requested, but failed to apply!"
214 die "Portage patch requested, but failed to apply!" 254 die "Portage patch requested, but failed to apply!"
215 fi 255 fi
216 else 256 else
217 ewarn " Could not apply portage.patch!" 257 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
258 # ewarn " Portage patch seems to be already applied."
218 ewarn " Please verify that it is not needed." 259 # ewarn " Please verify that it is not needed."
260 :
261 else
262 local version=$( \
263 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
264 echo "${VERSION}")
265
266 echo
267 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
268 die "Portage patch failed to apply!"
269 fi
270 # We do not want to run libtoolize ...
271 ELT_APPLIED_PATCHES="portage"
219 fi 272 fi
273 ;;
274 "uclibc-"*)
275 [[ ${CHOST} == *"-uclibc" ]] && \
276 ewarn " uClibc patch set '${y}' failed to apply!"
220 ;; 277 ;;
221 esac 278 esac
222 fi 279 fi
280 done
223 281
224 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then 282 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
225 if [[ ${do_portage} == "no" && \ 283 if [[ ${do_portage} == "no" && \
226 ${do_reversedeps} == "no" && \ 284 ${do_reversedeps} == "no" && \
227 ${do_only_patches} == "no" && \ 285 ${do_only_patches} == "no" && \
228 ${deptoremove} == "" ]] 286 ${deptoremove} == "" ]]
229 then 287 then
288 ewarn "Cannot apply any patches, please file a bug about this"
289 break
290
230 # Sometimes ltmain.sh is in a subdirectory ... 291 # Sometimes ltmain.sh is in a subdirectory ...
231 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then 292 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
232 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then 293 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
233 cd "${x}"/../ 294 cd "${x}"/../
234 fi
235 fi 295 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 296 fi
297
298 if type -p libtoolize &> /dev/null ; then
299 ewarn "Cannot apply any patches, running libtoolize..."
300 libtoolize --copy --force
301 fi
302 cd "${x}"
303 break
244 fi 304 fi
245 done 305 fi
306
307 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
308
309 touch "${x}/.elibtoolized"
246 done 310 done
247 311
248 if [[ -f libtool ]] ; then
249 rm -f libtool
250 fi
251
252 cd "${start_dir}" 312 cd "${start_dir}"
253
254 uclibctoolize
255} 313}
256 314
257uclibctoolize() { 315uclibctoolize() {
258 [[ -n ${NO_UCLIBCTOOLIZE} ]] && return 0 316 ewarn "uclibctoolize() is depreciated, please just use libtoolize()!"
259 317 elibtoolize
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} 318}
294 319
295darwintoolize() { 320darwintoolize() {
296 local targets="" 321 local targets=""
297 local x 322 local x
… …
316 eend $? "PLEASE CHECK ${x}" 341 eend $? "PLEASE CHECK ${x}"
317 ;; 342 ;;
318 esac 343 esac
319 done 344 done
320} 345}
346
347# char *VER_major(string)
348#
349# Return the Major (X of X.Y.Z) version
350#
351VER_major() {
352 [[ -z $1 ]] && return 1
353
354 local VER=$@
355 echo ${VER%%[^[:digit:]]*}
356}
357
358# char *VER_minor(string)
359#
360# Return the Minor (Y of X.Y.Z) version
361#
362VER_minor() {
363 [[ -z $1 ]] && return 1
364
365 local VER=$@
366 VER=${VER#*.}
367 echo ${VER%%[^[:digit:]]*}
368}
369
370# char *VER_micro(string)
371#
372# Return the Micro (Z of X.Y.Z) version.
373#
374VER_micro() {
375 [[ -z $1 ]] && return 1
376
377 local VER=$@
378 VER=${VER#*.*.}
379 echo ${VER%%[^[:digit:]]*}
380}
381
382# int VER_to_int(string)
383#
384# Convert a string type version (2.4.0) to an int (132096)
385# for easy compairing or versions ...
386#
387VER_to_int() {
388 [[ -z $1 ]] && return 1
389
390 local VER_MAJOR=$(VER_major "$1")
391 local VER_MINOR=$(VER_minor "$1")
392 local VER_MICRO=$(VER_micro "$1")
393 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
394
395 # We make version 1.0.0 the minimum version we will handle as
396 # a sanity check ... if its less, we fail ...
397 if [[ ${VER_int} -ge 65536 ]] ; then
398 echo "${VER_int}"
399 return 0
400 fi
401
402 echo 1
403 return 1
404}
Legend:
Removed from v.1.42  
changed lines
  Added in v.1.54
  ViewVC Help
Powered by ViewVC 1.1.13